Formatted markup, some CSS lint fixes