Reverted some of the changes to LayeredPainter

Snuck in during the prototyping phase of the zoom window