Update to zoom behavior
Various UI updates