Rename some fields in `Config`
Fix incorrect `layout` in `activity_base.xml`