Cleaned up unnecessary css definitions
Reorganized css file