Adds response to layout + some layout fixes