Clean up design, styles and markup