Improved keyboard shortcuts and fixed config values that were not saved