Fixed some server side aesthetics