{% macro render_field(field) %}
    <div class="form-group">
        {{ field.label(class_="form-label") }}
        {% if not kwargs['class_'] %}
          {{ field(class_="form-control", **kwargs)|safe }}
        {% else %}
          {{ field(**kwargs)|safe }}
        {% endif %}
        {% if field.errors %}
            {% for error in field.errors %}
                <span class="error">{{error}}</span>
            {% endfor %}
        {% endif %}
    </div>
{% endmacro %}


{% macro render_hidden(form) %}
    {{ form.hidden_tag() }}
{% endmacro %}


{% macro linked_with(links) %}
  <p>Linked with:</p>
  <ul>
    {% for link in links %}
    <li>
        {%- if link.__class__.__name__ == 'Competency' -%}
          Competency: {{ link.name }}

        {%- elif link.entry_type == 'objective' -%}
          Objective: {{ link.entry.what }}

        {%- elif link.entry_type == 'feedback' -%}
          Feedback: {{ link.entry.details }}

        {%- elif link.entry_type == 'log' -%}
          Note: {{ link.entry.content }}

        {%- endif -%}

        <a href="#remove-link?link={{ link.id }}">remove</a>
      </li>
    {% endfor %}
  </ul>
{% endmacro %}

{% macro render_field(field) %}
    <div class="form-group">
        {{ field.label(class_="form-label") }}
        {% if not kwargs['class_'] %}
          {{ field(class_="form-control", **kwargs)|safe }}
        {% else %}
          {{ field(**kwargs)|safe }}
        {% endif %}
        {% if field.errors %}
            {% for error in field.errors %}
                <span class="error">{{error}}</span>
            {% endfor %}
        {% endif %}
    </div>
{% endmacro %}


{% macro render_hidden(form) %}
    {{ form.hidden_tag() }}
{% endmacro %}


{% macro linked_with(links) %}
  <h3 class="heading-small">Linked to:</h3>
  <ul class="linked-list">
    {% if links %}

    {% for link in links %}
    <li class="linked-item">
      {%- if link.__class__.__name__ == 'Competency' -%}
        Competency: <a href="">{{ link.name }}</a>

      {%- elif link.entry_type == 'objective' -%}
        Objective: <a href="">{{ link.entry.what|truncate(40) }}</a>

      {%- elif link.entry_type == 'feedback' -%}
        Feedback: <a href="">{{ link.entry.details|truncate(40) }}</a>

      {%- elif link.entry_type == 'log' -%}
        Note: <a href="">{{ link.entry.content|truncate(40) }}</a>

      {%- endif -%}

      <span class="remove-link"><a href="">remove</a></span>
    </li>
    {% endfor %}

    {% endif %}
  </ul>
{% endmacro %}

Update linked-with macro to use new layout
Update linked-with macro to use new layout
