Clean up options shortcuts and integrate button clicks