New Layout

Fixed a lot of stuff