switched button position in first VC, changed number of wifi results, other tweaks
Merge branch 'ross'