Tweaked overlay and navigation again