Readded Angular route, fixed paths and finished initial version