Expand overview
Fix overview merge conflicts