a bit more UI cleanup