Edit Profile, polish & bugfix