more UI code clean up