Working on angular and frontend