Changed the time bin editor to picker and tidy up.