Add delete buttons on mouseover (some bugs still) and reorganize a few things.