Added user view and edit