fix layout and text