Cleaned up and reorganized CSS