Router / Application redesign to start in index page
Extract some code + more remodelling for Index page