Redesign layouts, added surveys