Created back button and added basic scenes and classes for layouts
Fixed merge issues