Fixed server code and modified .html files