UI UAT

Signed-off-by: mossrocket <peter@mossrocket.com>
Merge pull request #656 from nla/UI-fixes-from-UAT

UI UAT