Fixed the add questions and the layout