Add config options for toggling the title and description fields. Some minor refactoring of related code