More webapp improvment attempts