Fill color and refactoring some

I wanted to move some UI stuff out of the main prototype and keep it
more logic oriented.