changed order of textboxes on results page
Merge branch 'master' into featureimprovement

well because i changed something in master, duh