navigation refactor to stop flash of un-hidden on mobile

Signed-off-by: scottsavarie@gmail.com <158brunnenstrasse>