Merged Tim and Roy's changes to style.css (fixed)