#67 changed behaviour and renamed buttons