adding labels geome to visualize and minor improvements to UI organization