Made a layout for the user edit view
Refactored the views