Added layout structure, updated views, controllers