CSS refactoring, transition tweaks