More time picker cleanup. Added "Delete" button