Added Colorbar icon and relocated it in menu.  Fixed colorbar bug where empty units field caused null pointer exception