Some work on layout and colors
More layout and color updates