adds delete button and other goodies
added spacing
merge conflict
removed temporary margins