Move question to more appropriate position
Add more questions and remove descriptions