Buttons are done
Merge branch 'gui' into develop