Overlay working in project
Styling the overlay
Fixing merge conflicts between overlay and master