Cosmetic fixes
Implement overlay mode
Overlay mode now works