Fixed behaviour of buttons