Fixed #24 (advanced buffer GUI problems)

Let me know if it's not working how it should. I'm pretty sure I got it right, though.