ux fixes #1344, #1210, #1163, #1284