Remove panner, work on UI update