Cleanup MapFeature views and generalize accordion
Use enhanced decorate syntax everywhere
DRY out views using new syntax