Updated server and web app