Heavy CSS cleanup (and some HTML tweaks)