Redesign: small adjustments