Some redesign in layout