More CSS refactor for selected and hover classes