initial dist subtree commit
further attempts to fix edit view