UI clean up progress
more UI stuff