Integrate overlay components

See #80 (closed), wait for merge