Fix the layout some
Start working on color