Reorganise and document keyboard shortcuts