CSS refactors to improve readability