Layout and questions update