changed layouts, added viewport