More fixes to Web App