Z-index + particle storage simplification