Re-arrange header, add more questions