Move layout to .rhtml
Modify templates