Final web app changes