Allow reordering of pumps and timers (and some minor UI fixes) with saving to the config file