Code cleanup for window overlays in the overview
Just a few cleanup commits for the window overlays in the overview. Contains some commits from !136 (closed) and is now a dependency of !136 (closed).
I hope this way of grouping commits allows for an easier review.