Organize site.css & remove a few more redundant entries