category and lot more UI/UX changes