Rename some activity layouts, small fixes to User class