Finished new layout and basic styling