Move all overlay code from drawer to viewer