Update to show argname and small UI update