Continue adjusting routing and views, not sure yet if it works