Fix template more
Merge branch 'more_settings'