Changed the basic layout and made various commits