Improved CSS organization