Fixed minor issues
Fixed Project Category Mapping errors
Fixed merge conflict
Fixed merge again