More tweaks to UI/prototype wiring up