some cleanup
Some ui changes