classified model refactor, visual changes, settings