Added icons and more questions