restructured widgets for more universality
tweak design of store locator