Moved the delete button to the right
Merge pull request #266 from glee23/master

Moved the delete button to the right
Merge remote-tracking branch 'upstream/master'
See commit messages. Fixed some styles and deleted some TODOs that were
hanging around.