Edit buttons

Fixes to these bugs: 
https://github.com/Eduki/eduki/issues/115
https://github.com/Eduki/eduki/issues/99