In progress - lots of little ux/ui fixes