Move viewports into wrapper