Added Commando, UI updates