Angular routing refactored, bugfixes.