fix layout and spacing