Reorg to not redraw list every time
(Dirty) Merge branch 'gh-pages' into redraw and then some
Renamed url arg to server