Cleanup + Add user profile page