Fix UI and text displayed