New Layout

Fixed the layout, at the moment it is not fully functional.