Redesign main layout