updated layout and question details