diff --git a/footer.php b/footer.php
index c7b8e13..7b9e5c9 100644
--- a/footer.php
+++ b/footer.php
@@ -20,7 +20,7 @@ $pb_network_contact_form = get_option( 'pb_network_contact_form' );
 
 	</div><!-- #content -->
 
-	<footer class="footer<?php echo is_front_page() ? ' footer--home' : ' footer--inside' ?>">
+	<footer class="footer<?php echo is_front_page() ? ' footer--home' : ' footer--inside' ?>" role="contentinfo">
 	<div class="footer__inner">
 		<?php if ( $pb_network_contact_form ) :
 			include( locate_template( 'partials/contact-form.php' ) );
@@ -50,6 +50,7 @@ $pb_network_contact_form = get_option( 'pb_network_contact_form' );
 		</section>
 		<section class="footer__pressbooks">
 		  <a class="footer__pressbooks__icon" href="https://pressbooks.com" title="Pressbooks">
+				<?php // TODO ?>
 				<svg class="icon--svg">
 					<use xlink:href="#icon-pressbooks" />
 				</svg>
diff --git a/functions.php b/functions.php
index 0817a12..9d1b82d 100644
--- a/functions.php
+++ b/functions.php
@@ -141,8 +141,8 @@ add_action( 'after_setup_theme', 'pressbooks_aldine_content_width', 0 );
  */
 function pressbooks_aldine_widgets_init() {
 	$config = [
-		'before_widget' => '<section class="widget %1$s %2$s">',
-		'after_widget'  => '</section>',
+		'before_widget' => '<div class="widget %1$s %2$s">',
+		'after_widget'  => '</div>',
 		'before_title'  => '<h2>',
 		'after_title'   => '</h2>',
 	];
@@ -153,8 +153,8 @@ function pressbooks_aldine_widgets_init() {
 			'aldine'
 		),
 		'id'            => 'front-page-block',
-		'before_widget' => '<section class="block %1$s %2$s">',
-		'after_widget'  => '</section>',
+		'before_widget' => '<div class="block %1$s %2$s">',
+		'after_widget'  => '</div>',
 		'before_title'  => '<h2>',
 		'after_title'   => '</h2>',
 	] );
diff --git a/header.php b/header.php
index ea0d120..6125289 100644
--- a/header.php
+++ b/header.php
@@ -24,7 +24,7 @@
 <div id="page" class="site">
 	<a class="skip-link screen-reader-text" href="#content"><?php esc_html_e( 'Skip to content', 'pressbooks-aldine' ); ?></a>
 
-	<header id="masthead" class="site-header">
+	<header id="masthead" class="site-header" role="banner">
 		<div class="site-branding">
 			<?php
 			the_custom_logo();
@@ -43,7 +43,7 @@ if ( $description || is_customize_preview() ) : ?>
 		</div><!-- .site-branding -->
 
 		<nav id="site-navigation" class="main-navigation">
-			<button class="menu-toggle" aria-controls="primary-menu" aria-expanded="false"><?php esc_html_e( 'Primary Menu', 'pressbooks-aldine' ); ?></button>
+			<button type="button" class="menu-toggle" aria-controls="primary-menu" aria-expanded="false"><?php esc_html_e( 'Primary Menu', 'pressbooks-aldine' ); ?></button>
 			<?php
 				wp_nav_menu( [
 					'theme_location' => 'menu-1',
diff --git a/partials/book.php b/partials/book.php
index ef90260..b04fb2a 100644
--- a/partials/book.php
+++ b/partials/book.php
@@ -7,7 +7,7 @@ $date = ( isset( $book['metadata']['datePublished'] ) ) ? str_replace( '-', '',
 	data-license="<?php echo ( new \Pressbooks\Licensing() )->getLicenseFromUrl( $book['metadata']['license']['url'] ); ?>"
 	data-subject="<?php echo $subject ?>"
 >
-<?php if ( isset( $book['subject'] ) ) { ?>
+<?php if ( ! empty( $subject ) ) { ?>
   <p class="book__subject">
 	<a href="<?php echo network_home_url( "/catalog/#$subject" ) ?>"><?php echo \Pressbooks\Metadata\get_subject_from_thema( $book['subject'] ); ?></a>
   </p>
diff --git a/partials/contact-form.php b/partials/contact-form.php
index 1516de5..8fc1d26 100644
--- a/partials/contact-form.php
+++ b/partials/contact-form.php
@@ -22,23 +22,19 @@ $contact_form_response = \Aldine\Helpers\handle_contact_form_submission();
 		<?php wp_nonce_field( 'pb_root_contact_form', 'pb_root_contact_form_nonce' ); ?>
 		<input type="hidden" name="submitted" value="1">
 		<p class="form__row<?php if ( isset( $contact_form_response['field'] ) && $contact_form_response['field'] === 'visitor_name' ) : ?> form__row--error<?php endif; ?>">
-			<label class="clip" for="visitor_name"><?php _e( 'Your name*', 'aldine' ); ?></label>
-			<input type="text" placeholder="<?php _e( 'Your name*', 'aldine' ); ?>" name="visitor_name" value="<?php if ( $contact_form_response['status'] === 'error' ) :
+			<input type="text" aria-label="<?php _e( 'Your name (required)', 'aldine' ); ?>" placeholder="<?php _e( 'Your name*', 'aldine' ); ?>" name="visitor_name" value="<?php if ( $contact_form_response['status'] === 'error' ) :
 				echo $contact_form_response['values']['visitor_name'];
 			endif; ?>" required></p>
 		<p class="form__row<?php if ( isset( $contact_form_response['field'] ) && $contact_form_response['field'] === 'visitor_email' ) : ?> form__row--error<?php endif; ?>">
-			<label class="clip" for="visitor_email"><?php _e( 'Your email*', 'aldine' ); ?></label>
-			<input type="email" placeholder="<?php _e( 'Your email*', 'aldine' ); ?>" name="visitor_email" value="<?php if ( $contact_form_response['status'] === 'error' ) :
+			<input type="email" aria-label="<?php _e( 'Your email address (required)', 'aldine' ); ?>" placeholder="<?php _e( 'Your email*', 'aldine' ); ?>" name="visitor_email" value="<?php if ( $contact_form_response['status'] === 'error' ) :
 				echo $contact_form_response['values']['visitor_email'];
 			endif; ?>" required></p>
 		<p class="form__row<?php if ( isset( $contact_form_response['field'] ) && $contact_form_response['field'] === 'visitor_institution' ) : ?> form__row--error<?php endif; ?>">
-			<label class="clip" for="visitor_institution"><?php _e( 'Your institution*', 'aldine' ); ?></label>
-			<input type="text" placeholder="<?php _e( 'Your institution*', 'aldine' ); ?>" name="visitor_institution" value="<?php if ( $contact_form_response['status'] === 'error' ) :
+			<input type="text" aria-label="<?php _e( 'Your institution (required)', 'aldine' ); ?>" placeholder="<?php _e( 'Your institution*', 'aldine' ); ?>" name="visitor_institution" value="<?php if ( $contact_form_response['status'] === 'error' ) :
 				echo $contact_form_response['values']['visitor_institution'];
 			endif; ?>" required></p>
 		<p class="form__row<?php if ( isset( $contact_form_response['field'] ) && $contact_form_response['field'] === 'message' ) : ?> form__row--error<?php endif; ?>">
-			<label class="clip" for="message"><?php _e( 'Your message here*', 'aldine' ); ?></label>
-			<textarea type="text" placeholder="<?php _e( 'Your message here*', 'aldine' ); ?>" name="message" required><?php if ( $contact_form_response['status'] === 'error' ) :
+			<textarea type="text" aria-label="<?php _e( 'Your message (required)', 'aldine' ); ?>" placeholder="<?php _e( 'Your message here*', 'aldine' ); ?>" name="message" required><?php if ( $contact_form_response['status'] === 'error' ) :
 				echo $contact_form_response['values']['message'];
 			endif; ?></textarea></p>
 		<p class="form__row"><input class="button button--small button--outline" type="submit" value="<?php _e( 'Send', 'aldine' ); ?>" /></p>