Clone view
Reverted: Clone view (more or less...)
Improvements