Prevent load order issue with i18n-spec
Remove Erb layout
Add #page wrapper in layout
Update history