Updated links in HTML
Added layout link tests
Updated routes