Login and Navigation updated