Further modifications to layout and initial work on presets maintenance.