more refactorings in web-frontend