more CSS enhancements and simplifications