Add overview control and more work on theme and presets