Latest set of web changes

Hey Stephen - here is the latest set of changes to the web project. Please, let me know if there are any issues.