Convert pretty much everything to erb
Fix layout in erb