Reorganized CSS to be more modular