Getting basic zoom/pan working better