Fixes to UI feedback by Amir/Poonum