fix layout and design