fix layout and texts