Updated design with client feedback