layout

Move things around
merged layout

conflict in css