Redesign layouts according to guidelines