Fix overlays
Fix sidebar issues
Merge branch 'master' into fredley