Fixed #24 (advanced buffer GUI problems)
Tiny code cleanup
Merge pull request #25 from squeek502/gui

Fixed #24 (advanced buffer GUI problems)