Redesigned layout once again