diff --git a/plugins/wporg-5ftf/includes/pledge-form.php b/plugins/wporg-5ftf/includes/pledge-form.php
index 11a5d20..9e75ce6 100755
--- a/plugins/wporg-5ftf/includes/pledge-form.php
+++ b/plugins/wporg-5ftf/includes/pledge-form.php
@@ -12,6 +12,7 @@ use WP_Error;
 
 defined( 'WPINC' ) || die();
 
+// Todo make this into simple optionless blocks instead?
 add_shortcode( '5ftf_pledge_form_new', __NAMESPACE__ . '\render_form_new' );
 add_shortcode( '5ftf_pledge_form_manage', __NAMESPACE__ . '\render_form_manage' );
 
diff --git a/plugins/wporg-5ftf/includes/pledge-meta.php b/plugins/wporg-5ftf/includes/pledge-meta.php
index ac14688..5713fb0 100755
--- a/plugins/wporg-5ftf/includes/pledge-meta.php
+++ b/plugins/wporg-5ftf/includes/pledge-meta.php
@@ -136,25 +136,24 @@ function add_meta_boxes() {
  */
 function render_meta_boxes( $pledge, $box ) {
 	$editable = current_user_can( 'edit_pledge', $pledge->ID );
+	$data     = array();
+
+	foreach ( get_pledge_meta_config() as $key => $config ) {
+		$data[ $key ] = get_post_meta( $pledge->ID, META_PREFIX . $key, $config['single'] );
+	}
 
 	switch ( $box['id'] ) {
 		case 'pledge-email':
-			$email     = get_post_meta( $pledge->ID, META_PREFIX . 'pledge-email', true );
-			$confirmed = get_post_meta( $pledge->ID, META_PREFIX . 'pledge-email-confirmed', true );
+			require FiveForTheFuture\get_views_path() . 'inputs-pledge-org-email.php';
 			break;
 		case 'org-info':
-			$data = array();
-
-			foreach ( get_pledge_meta_config( 'user_input' ) as $key => $config ) {
-				$data[ $key ] = get_post_meta( $pledge->ID, META_PREFIX . $key, $config['single'] );
-			}
+			require FiveForTheFuture\get_views_path() . 'inputs-pledge-org-info.php';
 			break;
-		case 'pledge-contributors':
 
+		case 'pledge-contributors':
+			require FiveForTheFuture\get_views_path() . 'inputs-pledge-contributors.php';
 			break;
 	}
-
-	require dirname( __DIR__ ) . '/views/metabox-' . sanitize_file_name( $box['id'] ) . '.php';
 }
 
 /**
diff --git a/plugins/wporg-5ftf/index.php b/plugins/wporg-5ftf/index.php
index 2c083a8..c234741 100755
--- a/plugins/wporg-5ftf/index.php
+++ b/plugins/wporg-5ftf/index.php
@@ -28,3 +28,39 @@ function load() {
 	require_once PATH . 'includes/pledge-form.php';
 	require_once PATH . 'includes/shortcodes.php';
 }
+
+/**
+ * Shortcut to the assets directory.
+ *
+ * @return string
+ */
+function get_assets_path() {
+	return PATH . 'assets/';
+}
+
+/**
+ * Shortcut to the assets URL.
+ *
+ * @return string
+ */
+function get_assets_url() {
+	return URL . 'assets/';
+}
+
+/**
+ * Shortcut to the includes directory.
+ *
+ * @return string
+ */
+function get_includes_path() {
+	return PATH . 'includes/';
+}
+
+/**
+ * Shortcut to the views directory.
+ *
+ * @return string
+ */
+function get_views_path() {
+	return PATH . 'views/';
+}
diff --git a/plugins/wporg-5ftf/views/form-pledge-manage.php b/plugins/wporg-5ftf/views/form-pledge-manage.php
index 0fa4736..bce888f 100644
--- a/plugins/wporg-5ftf/views/form-pledge-manage.php
+++ b/plugins/wporg-5ftf/views/form-pledge-manage.php
@@ -1,8 +1,21 @@
 <?php
-/**
- *
- */
+namespace WordPressDotOrg\FiveForTheFuture\View;
+
+use function WordPressDotOrg\FiveForTheFuture\get_views_path;
 
 /** @var array $messages */
 /** @var bool  $updated */
 ?>
+
+<form id="5ftf-form-pledge-new" action="" method="post">
+	<?php
+	require get_views_path() . 'inputs-pledge-org-info.php';
+	require get_views_path() . 'inputs-pledge-org-logo.php';
+	require get_views_path() . 'inputs-pledge-org-email.php';
+	require get_views_path() . 'inputs-pledge-contributors.php';
+	?>
+
+	<div>
+		<input type="submit" id="5ftf-pledge-submit" name="action" class="button button-primary" value="<?php esc_attr_e( 'Update Pledge', 'wporg' ); ?>" />
+	</div>
+</form>
diff --git a/plugins/wporg-5ftf/views/form-pledge-new.php b/plugins/wporg-5ftf/views/form-pledge-new.php
index 7ba8f30..5e26434 100755
--- a/plugins/wporg-5ftf/views/form-pledge-new.php
+++ b/plugins/wporg-5ftf/views/form-pledge-new.php
@@ -1,7 +1,7 @@
 <?php
-/**
- *
- */
+namespace WordPressDotOrg\FiveForTheFuture\View;
+
+use function WordPressDotOrg\FiveForTheFuture\get_views_path;
 
 /** @var array $messages */
 /** @var bool  $complete */
@@ -29,77 +29,14 @@
 
 <?php else : ?>
 
-	<form action="" method="post">
-		<div>
-			<label for="5ftf-org-name">
-				<?php _e( 'Organization Name', 'wporg' ); ?>
-			</label>
-			<input
-				type="text"
-				id="5ftf-org-name"
-				name="org-name"
-				value="<?php echo esc_attr( filter_input( INPUT_POST, 'org-name' ) ); ?>"
-				required
-			/>
-		</div>
-
-		<div>
-			Logo <strong>TODO</strong>
-		</div>
-
-		<div>
-			<label for="5ftf-org-description">
-				<?php _e( 'Organization Blurb', 'wporg' ); ?>
-			</label>
-			<textarea
-				id="5ftf-org-description"
-				name="org-description"
-				required
-			>
-				<?php echo esc_html( filter_input( INPUT_POST, 'org-description' ) ); ?>
-			</textarea>
-			<span class="field-help">280 characters</span>
-		</div>
-
-		<div>
-			<label for="5ftf-admin-wporg-username">
-				<?php _e( 'Admin Username', 'wporg' ); ?>
-			</label>
-			<input
-				type="text"
-				id="5ftf-admin-wporg-username"
-				name="admin-wporg-username"
-				value="<?php echo esc_attr( filter_input( INPUT_POST, 'admin-wporg-username' ) ); ?>"
-				required
-			/>
-			<span class="field-help">This user will be responsible for managing your organization's pledge.</span>
-		</div>
-
-		<div>
-			<label for="5ftf-contributor-wporg-usernames">
-				<?php _e( 'Contributing Employee Usernames', 'wporg' ); ?>
-			</label>
-			<input
-				type="text"
-				id="5ftf-contributor-wporg-usernames"
-				name="contributor-wporg-usernames"
-				value="<?php echo esc_attr( filter_input( INPUT_POST, 'contributor-wporg-usernames' ) ); ?>"
-				required
-			/>
-			<span class="field-help">Separate each username with a comma.</span>
-		</div>
-
-		<div>
-			<label for="5ftf-pledge-agreement">
-				<input
-					type="checkbox"
-					id="5ftf-pledge-agreement"
-					name="pledge-agreement"
-					required
-				/>
-				<?php _e( 'I agree', 'wporg' ); ?>
-			</label>
-		</div>
+	<form id="5ftf-form-pledge-new" action="" method="post">
+		<?php
+		require get_views_path() . 'inputs-pledge-org-info.php';
+		require get_views_path() . 'inputs-pledge-org-logo.php';
+		require get_views_path() . 'inputs-pledge-org-email.php';
+		require get_views_path() . 'inputs-pledge-contributors.php';
+		require get_views_path() . 'inputs-pledge-new-misc.php';
+		?>
 
 		<div>
 			<input type="submit" id="5ftf-pledge-submit" name="action" class="button button-primary" value="<?php esc_attr_e( 'Submit Pledge', 'wporg' ); ?>" />
diff --git a/plugins/wporg-5ftf/views/inputs-pledge-contributors.php b/plugins/wporg-5ftf/views/inputs-pledge-contributors.php
new file mode 100644
index 0000000..f4f7aed
--- /dev/null
+++ b/plugins/wporg-5ftf/views/inputs-pledge-contributors.php
@@ -0,0 +1,34 @@
+<?php
+namespace WordPressDotOrg\FiveForTheFuture\View;
+
+/** @var bool $editable */
+/** @var array $data */
+/** @var array $contributors */
+?>
+
+<?php if ( empty( $contributors ) ) : ?>
+
+<div class="form-field">
+	<label for="5ftf-pledge-contributors">
+		<?php esc_html_e( 'Contributors', 'wordpressorg' ); ?>
+	</label>
+	<input
+		type="text"
+		class="large-text"
+		id="5ftf-pledge-contributors"
+		name="pledge-contributors"
+		value=""
+		required
+	/>
+	<p>
+		<!-- Instructions for inputting wporg usernames -->
+	</p>
+</div>
+
+<?php else : ?>
+
+<div class="5ftf-contributors">
+
+</div>
+
+<?php endif; ?>
diff --git a/plugins/wporg-5ftf/views/inputs-pledge-new-misc.php b/plugins/wporg-5ftf/views/inputs-pledge-new-misc.php
new file mode 100644
index 0000000..edb3ca6
--- /dev/null
+++ b/plugins/wporg-5ftf/views/inputs-pledge-new-misc.php
@@ -0,0 +1,22 @@
+<?php
+namespace WordPressDotOrg\FiveForTheFuture\View;
+
+/** @var bool $editable */
+/** @var array $data */
+?>
+
+<div class="form-field">
+	<p>
+		<!-- Statement of agreement to pledge, link to further info maybe? -->
+	</p>
+
+	<input
+		type="checkbox"
+		id="5ftf-pledge-agree"
+		name="pledge-agree"
+		required
+	/>
+	<label for="5ftf-pledge-agree">
+		<?php esc_html_e( 'I agree', 'wordpressorg' ); ?>
+	</label>
+</div>
diff --git a/plugins/wporg-5ftf/views/inputs-pledge-org-email.php b/plugins/wporg-5ftf/views/inputs-pledge-org-email.php
new file mode 100644
index 0000000..654f170
--- /dev/null
+++ b/plugins/wporg-5ftf/views/inputs-pledge-org-email.php
@@ -0,0 +1,34 @@
+<?php
+namespace WordPressDotOrg\FiveForTheFuture\View;
+
+/** @var bool $editable */
+/** @var array $data */
+?>
+
+<div class="form-field">
+	<label for="5ftf-pledge-email" class="screen-reader-text">
+		<?php esc_html_e( 'Email', 'wordpressorg' ); ?>
+	</label>
+	<input
+		type="email"
+		class="large-text"
+		id="5ftf-pledge-email"
+		name="org-pledge-email"
+		value="<?php echo esc_attr( $data['pledge-email'] ); ?>"
+		required
+		<?php echo ( $editable ) ? '' : 'readonly'; ?>
+	/>
+
+	<?php if ( is_admin() ) : ?>
+		<?php if ( $data['pledge-email-confirmed'] ) : ?>
+			<span class="dashicons dashicons-yes-alt" aria-hidden="true"></span>
+			<?php esc_html_e( 'Confirmed', 'wporg' ); ?>
+		<?php else : ?>
+			<span class="dashicons dashicons-warning" aria-hidden="true"></span>
+			<?php esc_html_e( 'Unconfirmed', 'wporg' ); ?>
+			<button class="button-secondary">
+				<?php esc_html_e( 'Resend confirmation', 'wporg' ); ?>
+			</button>
+		<?php endif; ?>
+	<?php endif; ?>
+</div>
diff --git a/plugins/wporg-5ftf/views/inputs-pledge-org-info.php b/plugins/wporg-5ftf/views/inputs-pledge-org-info.php
new file mode 100644
index 0000000..aa87d0a
--- /dev/null
+++ b/plugins/wporg-5ftf/views/inputs-pledge-org-info.php
@@ -0,0 +1,51 @@
+<?php
+namespace WordPressDotOrg\FiveForTheFuture\View;
+
+/** @var bool $editable */
+/** @var array $data */
+?>
+
+<div class="form-field">
+	<label for="5ftf-org-name">
+		<?php esc_html_e( 'Organization Name', 'wordpressorg' ); ?>
+	</label>
+	<input
+		type="text"
+		class="large-text"
+		id="5ftf-org-name"
+		name="org-name"
+		value="<?php echo esc_attr( $data['org-name'] ); ?>"
+		required
+		<?php echo ( $editable ) ? '' : 'readonly'; ?>
+	/>
+</div>
+
+<div class="form-field">
+	<label for="5ftf-org-url">
+		<?php esc_html_e( 'Website Address', 'wordpressorg' ); ?>
+	</label>
+	<input
+		type="url"
+		class="large-text"
+		id="5ftf-org-url"
+		name="org-url"
+		value="<?php echo esc_attr( $data['org-url'] ); ?>"
+		required
+		<?php echo ( $editable ) ? '' : 'readonly'; ?>
+	/>
+</div>
+
+<div class="form-field">
+	<label for="5ftf-org-description">
+		<?php _e( 'Organization Blurb', 'wordpressorg' ); ?>
+	</label>
+	<textarea
+		class="large-text"
+		id="5ftf-org-description"
+		name="org-description"
+		required
+		<?php echo ( $editable ) ? '' : 'readonly'; ?>
+	>
+		<?php echo esc_html( $data['org-description'] ); ?>
+	</textarea>
+</div>
diff --git a/plugins/wporg-5ftf/views/inputs-pledge-org-logo.php b/plugins/wporg-5ftf/views/inputs-pledge-org-logo.php
new file mode 100644
index 0000000..50f842d
--- /dev/null
+++ b/plugins/wporg-5ftf/views/inputs-pledge-org-logo.php
@@ -0,0 +1,17 @@
+<?php
+namespace WordPressDotOrg\FiveForTheFuture\View;
+
+/** @var bool $editable */
+/** @var array $data */
+?>
+
+<div class="form-field">
+	<label for="5ftf-org-logo">
+		<?php esc_html_e( 'Logo', 'wordpressorg' ); ?>
+	</label>
+	<input
+		type="file"
+		id="5ftf-org-logo"
+		name="org-logo"
+	/>
+</div>
diff --git a/plugins/wporg-5ftf/views/metabox-org-info.php b/plugins/wporg-5ftf/views/metabox-org-info.php
deleted file mode 100755
index e012115..0000000
--- a/plugins/wporg-5ftf/views/metabox-org-info.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/** @var bool $editable */
-/** @var array $data */
-?>
-
-<table class="form-table">
-	<tbody>
-		<tr>
-			<th>
-				<label for="5ftf-org-name">
-					<?php esc_html_e( 'Organization Name', 'wordpressorg' ); ?>
-				</label>
-			</th>
-			<td>
-				<input
-					type="text"
-					class="large-text"
-					id="5ftf-org-name"
-					name="org-name"
-					value="<?php echo esc_attr( $data['org-name'] ); ?>"
-					required
-					<?php echo ( $editable ) ? '' : 'readonly'; ?>
-				/>
-			</td>
-		</tr>
-		<tr>
-			<th>
-				<label for="5ftf-org-url">
-					<?php esc_html_e( 'Website Address', 'wordpressorg' ); ?>
-				</label>
-			</th>
-			<td>
-				<input
-					type="url"
-					class="large-text"
-					id="5ftf-org-url"
-					name="org-url"
-					value="<?php echo esc_attr( $data['org-url'] ); ?>"
-					required
-					<?php echo ( $editable ) ? '' : 'readonly'; ?>
-				/>
-			</td>
-		</tr>
-		<tr>
-			<th>
-				<label for="5ftf-org-description">
-					<?php _e( 'Organization Blurb', 'wordpressorg' ); ?>
-				</label>
-			</th>
-			<td>
-				<textarea
-					class="large-text"
-					id="5ftf-org-description"
-					name="org-description"
-					required
-					<?php echo ( $editable ) ? '' : 'readonly'; ?>
-				>
-					<?php echo esc_html( $data['org-description'] ); ?>
-				</textarea>
-			</td>
-		</tr>
-	</tbody>
-</table>
diff --git a/plugins/wporg-5ftf/views/metabox-pledge-contributors.php b/plugins/wporg-5ftf/views/metabox-pledge-contributors.php
deleted file mode 100644
index a792de7..0000000
--- a/plugins/wporg-5ftf/views/metabox-pledge-contributors.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-?>
-
-TBD
diff --git a/plugins/wporg-5ftf/views/metabox-pledge-email.php b/plugins/wporg-5ftf/views/metabox-pledge-email.php
deleted file mode 100644
index 13ef541..0000000
--- a/plugins/wporg-5ftf/views/metabox-pledge-email.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/** @var bool $editable */
-/** @var string $email */
-/** @var bool $confirmed */
-?>
-
-<label for="5ftf-pledge-email" class="screen-reader-text">
-	<?php esc_html_e( 'Email', 'wordpressorg' ); ?>
-</label>
-
-<input
-	type="text"
-	class="regular-text"
-	id="5ftf-pledge-email"
-	name="org-pledge-email"
-	value="<?php echo esc_attr( $data['pledge-email'] ); ?>"
-	required
-	<?php echo ( $editable ) ? '' : 'readonly'; ?>
-/>
-
-<?php if ( $confirmed ) : ?>
-	<span class="dashicons dashicons-yes-alt" aria-hidden="true"></span>
-	<?php esc_html_e( 'Confirmed', 'wporg' ); ?>
-<?php else : ?>
-	<span class="dashicons dashicons-warning" aria-hidden="true"></span>
-	<?php esc_html_e( 'Unconfirmed', 'wporg' ); ?>
-	<button class="button-secondary">
-		<?php esc_html_e( 'Resend confirmation', 'wporg' ); ?>
-	</button>
-<?php endif; ?>