Some changes to routing and views