Get layout extend/block working correctly