Better Drag/Zoom handling & Colored Nodes & Code cleaning