Updated to include content-first markup

Also changed less compression to improve css readability