Minor rearrangement of DOM and styling. Renamed some elements.