diff --git a/web/src/pages/LibraryPage.ts b/web/src/pages/LibraryPage.ts
index fafbbb386..3d0bdff42 100644
--- a/web/src/pages/LibraryPage.ts
+++ b/web/src/pages/LibraryPage.ts
@@ -1,13 +1,14 @@
+import { gettext } from "django";
 import { css, CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
+import { ifDefined } from "lit-html/directives/if-defined";
 import { Application } from "../api/application";
 import { PBResponse } from "../api/client";
 import { COMMON_STYLES } from "../common/styles";
-import { truncate } from "../utils";
+import { loading, truncate } from "../utils";
 
-@customElement("pb-library")
-export class ApplicationViewPage extends LitElement {
+export class LibraryApplication extends LitElement {
     @property({attribute: false})
-    apps?: PBResponse<Application>;
+    application?: Application;
 
     static get styles(): CSSResult[] {
         return COMMON_STYLES.concat(
@@ -22,6 +23,37 @@ export class ApplicationViewPage extends LitElement {
         );
     }
 
+    render(): TemplateResult {
+        if (!this.application) {
+            return html`<pb-spinner></pb-spinner>`;
+        }
+        return html` <a href="${this.application.launch_url}" class="pf-c-card pf-m-hoverable pf-m-compact">
+            <div class="pf-c-card__header">
+                ${this.application.meta_icon
+        ? html`<img class="app-icon pf-c-avatar" src="${ifDefined(this.application.meta_icon)}" alt="Application Icon"/>`
+        : html`<i class="pf-icon pf-icon-arrow"></i>`}
+            </div>
+            <div class="pf-c-card__title">
+                <p id="card-1-check-label">${this.application.name}</p>
+                <div class="pf-c-content">
+                    <small>${this.application.meta_publisher}</small>
+                </div>
+            </div>
+            <div class="pf-c-card__body">${truncate(this.application.meta_description, 35)}</div>
+        </a>`;
+    }
+
+}
+
+@customElement("pb-library")
+export class LibraryPage extends LitElement {
+    @property({attribute: false})
+    apps?: PBResponse<Application>;
+
+    static get styles(): CSSResult[] {
+        return COMMON_STYLES;
+    }
+
     firstUpdated(): void {
         Application.list().then((r) => (this.apps = r));
     }
@@ -30,61 +62,17 @@ export class ApplicationViewPage extends LitElement {
         return html` <div class="pf-c-empty-state pf-m-full-height">
             <div class="pf-c-empty-state__content">
                 <i class="fas fa-cubes pf-c-empty-state__icon" aria-hidden="true"></i>
-                <h1 class="pf-c-title pf-m-lg">No Applications available.</h1>
+                <h1 class="pf-c-title pf-m-lg">${gettext("No Applications available.")}</h1>
                 <div class="pf-c-empty-state__body">
-                    Either no applications are defined, or you don't have access to any.
+                    ${gettext("Either no applications are defined, or you don't have access to any.")}
                 </div>
-                {% if perms.passbook_core.add_application %}
-                <a
-                    href="{% url 'passbook_admin:application-create' %}"
-                    class="pf-c-button pf-m-primary"
-                    type="button"
-                >
-                    {% trans 'Create Application' %}
-                </a>
-                {% endif %}
             </div>
         </div>`;
     }
 
-    renderApp(app: Application): TemplateResult {
-        return html` <a href="${app.launch_url}" class="pf-c-card pf-m-hoverable pf-m-compact">
-            <div class="pf-c-card__header">
-                ${app.meta_icon
-        ? html`<img
-                          class="app-icon pf-c-avatar"
-                          src="${app.meta_icon}"
-                          alt="Application Icon"
-                      />`
-        : html`<i class="pf-icon pf-icon-arrow"></i>`}
-            </div>
-            <div class="pf-c-card__title">
-                <p id="card-1-check-label">${app.name}</p>
-                <div class="pf-c-content">
-                    <small>${app.meta_publisher}</small>
-                </div>
-            </div>
-            <div class="pf-c-card__body">${truncate(app.meta_description, 35)}</div>
-        </a>`;
-    }
-
-    renderLoading(): TemplateResult {
-        return html`<div class="pf-c-empty-state pf-m-full-height">
-            <div class="pf-c-empty-state__content">
-                <div class="pf-l-bullseye">
-                    <div class="pf-l-bullseye__item">
-                        <span
-                            class="pf-c-spinner pf-m-xl"
-                            role="progressbar"
-                            aria-valuetext="Loading..."
-                        >
-                            <span class="pf-c-spinner__clipper"></span>
-                            <span class="pf-c-spinner__lead-ball"></span>
-                            <span class="pf-c-spinner__tail-ball"></span>
-                        </span>
-                    </div>
-                </div>
-            </div>
+    renderApps(): TemplateResult {
+        return html`<div class="pf-l-gallery pf-m-gutter">
+            ${this.apps?.results.map((app) => html`<pb-library-app application=${app}></pb-library-app>`)}
         </div>`;
     }
 
@@ -94,17 +82,15 @@ export class ApplicationViewPage extends LitElement {
                 <div class="pf-c-content">
                     <h1>
                         <i class="pf-icon pf-icon-applications"></i>
-                        Applications
+                        ${gettext("Applications")}
                     </h1>
                 </div>
             </section>
-            ${this.apps
-        ? html`<section class="pf-c-page__main-section">
-                      <div class="pf-l-gallery pf-m-gutter">
-                          ${this.apps.results.map((app) => this.renderApp(app))}
-                      </div>
-                  </section>`
-        : this.renderLoading()}
+            <section class="pf-c-page__main-section">
+            ${loading(this.apps, html`${(this.apps?.results.length || 0) > 0 ?
+        this.renderApps() :
+        this.renderEmptyState()}`)}
+            </section>
         </main>`;
     }
 }
diff --git a/web/src/utils.ts b/web/src/utils.ts
index b767a79fc..b26cc2ddd 100644
--- a/web/src/utils.ts
+++ b/web/src/utils.ts
@@ -1,4 +1,5 @@
 import { html, TemplateResult } from "lit-html";
+import { SpinnerSize } from "./elements/Spinner";
 
 export function getCookie(name: string): string | undefined {
     let cookieValue = undefined;
@@ -34,3 +35,18 @@ export function truncate(input?: string, max = 10): string {
 export function htmlFromString(...strings: string[]): TemplateResult {
     return html({ raw: strings, ...strings } as TemplateStringsArray);
 }
+
+export function loading<T>(v: T, actual: TemplateResult): TemplateResult {
+    if (!v) {
+        return html`<div class="pf-c-empty-state pf-m-full-height">
+            <div class="pf-c-empty-state__content">
+                <div class="pf-l-bullseye">
+                    <div class="pf-l-bullseye__item">
+                        <pb-spinner size="${SpinnerSize.Large}"></pb-spinner>
+                    </div>
+                </div>
+            </div>
+        </div>`;
+    }
+    return actual;
+}