add nested views extension & little cleanup