V2.0 picturefill refactor