Major layout improvement with response added