Merge pull request #38 from DrJJ/gui

Update + delete buttons, no image yet
Merge remote-tracking branch 'origin/master' into gui