Layer upload/remove switcheroo