Adjusted spacing in layout and cleaned up markup