#5 Clean up command UI