UX spruce up and few fixes