UI related fixes/improvements from Nelson