Design changes; messaging done