Changed Edit Profile page, Changed navbar
re commit
clean merge conflict