Merged Tim and Roy's changes in style.css