diff --git a/.github/codecov.yml b/.github/codecov.yml
new file mode 100644
index 000000000..2d176f2bc
--- /dev/null
+++ b/.github/codecov.yml
@@ -0,0 +1,3 @@
+coverage:
+  precision: 2
+  round: up
diff --git a/web/src/elements/forms/FormGroup.ts b/web/src/elements/forms/FormGroup.ts
new file mode 100644
index 000000000..0109be284
--- /dev/null
+++ b/web/src/elements/forms/FormGroup.ts
@@ -0,0 +1,51 @@
+import { css, CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
+import PFBase from "@patternfly/patternfly/patternfly-base.css";
+import PFForm from "@patternfly/patternfly/components/Form/form.css";
+import PFFormControl from "@patternfly/patternfly/components/FormControl/form-control.css";
+import AKGlobal from "../../authentik.css";
+import PFButton from "@patternfly/patternfly/components/Button/button.css";
+
+@customElement("ak-form-group")
+export class FormGroup extends LitElement {
+
+    @property({ type: Boolean })
+    expanded = false;
+
+    static get styles(): CSSResult[] {
+        return [PFBase, PFForm, PFButton, PFFormControl, AKGlobal, css`
+            slot[name=body][hidden] {
+                display: none !important;
+            }
+        `];
+    }
+
+    render(): TemplateResult {
+        return html`<div class="pf-c-form__field-group ${this.expanded ? "pf-m-expanded" : ""}">
+            <div class="pf-c-form__field-group-toggle">
+                <div class="pf-c-form__field-group-toggle-button">
+                    <button class="pf-c-button pf-m-plain" type="button" aria-expanded="${this.expanded}" aria-label="Details" @click=${() => {
+                        this.expanded = !this.expanded;
+                    }}>
+                        <span class="pf-c-form__field-group-toggle-icon">
+                            <i class="fas fa-angle-right" aria-hidden="true"></i>
+                        </span>
+                    </button>
+                </div>
+            </div>
+            <div class="pf-c-form__field-group-header">
+                <div class="pf-c-form__field-group-header-main">
+                    <div class="pf-c-form__field-group-header-title">
+                        <div class="pf-c-form__field-group-header-title-text">
+                            <slot name="header"></slot>
+                        </div>
+                    </div>
+                    <div class="pf-c-form__field-group-header-description">
+                        <slot name="description"></slot>
+                    </div>
+                </div>
+            </div>
+            <slot ?hidden=${!this.expanded} class="pf-c-form__field-group-body" name="body"></slot>
+        </div>`;
+    }
+
+}
diff --git a/web/src/pages/sources/SourceViewPage.ts b/web/src/pages/sources/SourceViewPage.ts
index 3a157492f..b365d8762 100644
--- a/web/src/pages/sources/SourceViewPage.ts
+++ b/web/src/pages/sources/SourceViewPage.ts
@@ -6,9 +6,9 @@ import "../../elements/buttons/ModalButton";
 import "../../elements/buttons/SpinnerButton";
 import "../../elements/EmptyState";
 
-import "./LDAPSourceViewPage";
-import "./OAuthSourceViewPage";
-import "./SAMLSourceViewPage";
+import "./ldap/LDAPSourceViewPage";
+import "./oauth/OAuthSourceViewPage";
+import "./saml/SAMLSourceViewPage";
 
 @customElement("ak-source-view")
 export class SourceViewPage extends LitElement {
diff --git a/web/src/pages/sources/LDAPSourceViewPage.ts b/web/src/pages/sources/ldap/LDAPSourceViewPage.ts
similarity index 93%
rename from web/src/pages/sources/LDAPSourceViewPage.ts
rename to web/src/pages/sources/ldap/LDAPSourceViewPage.ts
index fcb7d7584..d261a3a68 100644
--- a/web/src/pages/sources/LDAPSourceViewPage.ts
+++ b/web/src/pages/sources/ldap/LDAPSourceViewPage.ts
@@ -9,21 +9,21 @@ import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList
 import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css";
 import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css";
 import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css";
-import AKGlobal from "../../authentik.css";
+import AKGlobal from "../../../authentik.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
-import "../../elements/buttons/ModalButton";
-import "../../elements/buttons/SpinnerButton";
-import "../../elements/buttons/ActionButton";
-import "../../elements/CodeMirror";
-import "../../elements/Tabs";
-import "../../elements/events/ObjectChangelog";
-import { Page } from "../../elements/Page";
+import "../../../elements/buttons/ModalButton";
+import "../../../elements/buttons/SpinnerButton";
+import "../../../elements/buttons/ActionButton";
+import "../../../elements/CodeMirror";
+import "../../../elements/Tabs";
+import "../../../elements/events/ObjectChangelog";
+import { Page } from "../../../elements/Page";
 import { until } from "lit-html/directives/until";
 import { LDAPSource, SourcesApi } from "authentik-api";
-import { DEFAULT_CONFIG } from "../../api/Config";
-import { AdminURLManager } from "../../api/legacy";
-import { EVENT_REFRESH } from "../../constants";
+import { DEFAULT_CONFIG } from "../../../api/Config";
+import { AdminURLManager } from "../../../api/legacy";
+import { EVENT_REFRESH } from "../../../constants";
 
 @customElement("ak-source-ldap-view")
 export class LDAPSourceViewPage extends Page {
diff --git a/web/src/pages/sources/OAuthSourceViewPage.ts b/web/src/pages/sources/oauth/OAuthSourceViewPage.ts
similarity index 94%
rename from web/src/pages/sources/OAuthSourceViewPage.ts
rename to web/src/pages/sources/oauth/OAuthSourceViewPage.ts
index 5173d4d62..88bda19a5 100644
--- a/web/src/pages/sources/OAuthSourceViewPage.ts
+++ b/web/src/pages/sources/oauth/OAuthSourceViewPage.ts
@@ -9,19 +9,19 @@ import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList
 import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css";
 import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css";
 import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css";
-import AKGlobal from "../../authentik.css";
+import AKGlobal from "../../../authentik.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
-import "../../elements/buttons/ModalButton";
-import "../../elements/buttons/SpinnerButton";
-import "../../elements/CodeMirror";
-import "../../elements/Tabs";
-import "../../elements/events/ObjectChangelog";
-import { Page } from "../../elements/Page";
+import "../../../elements/buttons/ModalButton";
+import "../../../elements/buttons/SpinnerButton";
+import "../../../elements/CodeMirror";
+import "../../../elements/Tabs";
+import "../../../elements/events/ObjectChangelog";
+import { Page } from "../../../elements/Page";
 import { OAuthSource, SourcesApi } from "authentik-api";
-import { DEFAULT_CONFIG } from "../../api/Config";
-import { AdminURLManager } from "../../api/legacy";
-import { EVENT_REFRESH } from "../../constants";
+import { DEFAULT_CONFIG } from "../../../api/Config";
+import { AdminURLManager } from "../../../api/legacy";
+import { EVENT_REFRESH } from "../../../constants";
 
 @customElement("ak-source-oauth-view")
 export class OAuthSourceViewPage extends Page {
diff --git a/web/src/pages/sources/SAMLSourceViewPage.ts b/web/src/pages/sources/saml/SAMLSourceViewPage.ts
similarity index 94%
rename from web/src/pages/sources/SAMLSourceViewPage.ts
rename to web/src/pages/sources/saml/SAMLSourceViewPage.ts
index d3e87052c..de6b650c3 100644
--- a/web/src/pages/sources/SAMLSourceViewPage.ts
+++ b/web/src/pages/sources/saml/SAMLSourceViewPage.ts
@@ -10,19 +10,19 @@ import PFDescriptionList from "@patternfly/patternfly/components/DescriptionList
 import PFSizing from "@patternfly/patternfly/utilities/Sizing/sizing.css";
 import PFFlex from "@patternfly/patternfly/utilities/Flex/flex.css";
 import PFDisplay from "@patternfly/patternfly/utilities/Display/display.css";
-import AKGlobal from "../../authentik.css";
+import AKGlobal from "../../../authentik.css";
 import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
-import "../../elements/buttons/ModalButton";
-import "../../elements/buttons/SpinnerButton";
-import "../../elements/CodeMirror";
-import "../../elements/Tabs";
-import "../../elements/events/ObjectChangelog";
-import { Page } from "../../elements/Page";
+import "../../../elements/buttons/ModalButton";
+import "../../../elements/buttons/SpinnerButton";
+import "../../../elements/CodeMirror";
+import "../../../elements/Tabs";
+import "../../../elements/events/ObjectChangelog";
+import { Page } from "../../../elements/Page";
 import { SAMLSource, SourcesApi } from "authentik-api";
-import { DEFAULT_CONFIG } from "../../api/Config";
-import { AdminURLManager, AppURLManager } from "../../api/legacy";
-import { EVENT_REFRESH } from "../../constants";
+import { DEFAULT_CONFIG } from "../../../api/Config";
+import { AdminURLManager, AppURLManager } from "../../../api/legacy";
+import { EVENT_REFRESH } from "../../../constants";
 import { ifDefined } from "lit-html/directives/if-defined";
 
 @customElement("ak-source-saml-view")