Added panning
Fix toolbar checking