Add tab-manipulation shortcuts and clean-up