Move things around. Add css