Added edit icon to Edit Site button, 'start building' text
Merge kyledrake changes