updated css to include my previous changes along with keith's changes from 3/29/2013