Reorganized css to reflect recent changes.