Button and text fix