Improve user view and edit pages