Convert search to pushState
Consolidate layer initialization