added username, fixed navbar, email working