Add dependency support
Add generic option support
Handle clicks on Overview button
minor tweaks