Remove RoR link_to
Merge branch 'filling-in-layout'