buttons corrected
Merge commit 'fa3dfad1455e42fa3d5d63ab57482141568be14b' into masterRemote