Redesigned with angular route - added links