Fixed a bunch of small bugs some minor UI cleaning the code before we go
make a mess of it again.