Gh 483

selenium tests are all passing for this.  ready to merge.