service page and some cleanups