Minor styling adjustments
Added survery script
Merge into master