Buttons are also displayed correct now