Redesigned cell layout