Fix UI to perform commands