fixes for initial loading and navigation of views