Change structure of page and add comments to server code