More work on the user profile & edit screens