some fixes to the colors and layout