Introduce UI-Routing with subsequent changes on the design