merged navigation overlay with code cleanup