Layout Changes

Changed the layout and removed some bugs