Refactor a bit
Adds a buffer
Add some more options to the form