Integrate manmeet's change on base1 and viewbycategory, backend improvements on addcca and editprofile