Mobile nav refinement and cleanup