Better design of the Pills and Undo