Added layout
Adding new user functionality and making modals common modules