Redesign on fragments