Buttons fixes, build