smooth swapping and view reorg

also removed some pruned/unused code