updated server page with cleanups