Fixed correct showing of buttons