Updated some UX