fix layout and colors