style updates, start to use includes for picturefill blocks