Bug fix for routing.
Added icons.  Changed colors a bit.