Fixed some of the problems caused by merging the Angular project with the existing frontend