cleaning up more UI