ul -> table; buttons added; removal works