Redesigned main layout