Layers and less drawing bugs