Tighten up ui/ux