started to refactor web-frontend