Angular update, routing, main-view lot of improvements