misc cleanup
removed commented out code
misc ui adjustments
cleanup