At the time having all out UI code alongside the main file seemed a nice idea - now I am not so sure. Maybe move it outside of navigator and into it's own object but in the same file?