Fixed data overlay and started adding categories and icons