(mostly) finishd merging all assets into one transitionable page