Created a track layer, removed moveToFront calls and cleaned up other view instances, see #267, #292, #293