Fixes to views/routes