More template refactoring concerning type labels and the info bar structure