Updated dashboard and nav template to handle user context