Minor UI changes, some fixes to run and stop.
clean up
more clean up