Fixes to router and views