pretty much finished the layout
Nailed down colors
More layout changes