Layout and style changes

Moving around element blocks, and defining new styles for layout changes