Lots of little ux/ui fixes