Added User page
fixing merge conflicts...again