Fixed spinner load by using on click reference.
mend

Fixed spinner load by using on click reference. Also removed pages no longer needed lick result shell and form index partial.
Merge branch 'simplify'
Pulling in the updates that allowed for the spinner to show again. This will potentially overwrite the s3 changes and attemps at adding in maps.