renamed items, added button, added handlers