Fix custom key add/remove which is now on its own subtab