Some additional refactoring of class names to settings (buttons mainly).