Fix routes & master layout