Add More keyboard shortcuts and correct update tooltip