ui fixes and a couple of additional tests