* minor ui cleanup
* some more cleanup