Fix minor UI layout and text