Improve ux

FIxes #2123 
Fixes #2146 
Fixes #2156 
Fixes #2154