Minor CSS refactoring and cosmetic changes