Improved overview tool (work in progress)