clean up tracker layout a bit
more server management updates