Create category feature, fixed few UI bugs