Added secret question #2 and changed some stuff

I'll fix the tab indexes later Gemma!!!
fixed conflicts

Conflicts:
	Source/Display/Interfaces/Add.cs