Better replaceClass
Merge branch 'split-view'