Slight additions to server-side page