diff --git a/equipment-details.php b/equipment-details.php
new file mode 100644
index 0000000..feefef0
--- /dev/null
+++ b/equipment-details.php
@@ -0,0 +1,27 @@
+<?php
+/*
+Template Name: Equipment List Details
+*/
+?>
+<?php get_header(); ?>
+
+<?php if ( is_user_logged_in() ): ?>
+<?php if(have_posts()) { the_post(); } ?>
+<div class="fl-centered fl-col-mixed fl-site-wrapper idi-equipment">
+    <div class="fl-col-fixed fl-force-left">
+        <?php get_sidebar('equipment');?>
+        <?php get_sidebar('equipment-categories');?>
+    </div>
+    <div id="content" class="fl-col-flex idi-3cols">
+    	<div class="idi-breadcrumbs">
+			<a href="<?php echo get_home_url(); ?>/booking/equipment">Back to Equipment</a>
+    	</div>
+		<h2><?php the_title(); ?></h2>
+        
+		<?php the_content(); ?>
+	</div>
+</div> 
+<?php else: ?>
+	<p>You must login to view this content.</p>
+<?php endif; ?>
+<?php get_footer(); ?>
diff --git a/equipment.php b/equipment.php
new file mode 100644
index 0000000..d3d05b2
--- /dev/null
+++ b/equipment.php
@@ -0,0 +1,28 @@
+<?php
+/*
+Template Name: Equipment List
+*/
+?>
+<?php get_header(); ?>
+
+<?php if ( is_user_logged_in() ): ?>
+<div class="idi-equipment fl-centered fl-col-mixed fl-site-wrapper">
+    <div class="fl-col-fixed fl-force-left">
+        <?php get_sidebar('equipment');?>
+    </div>
+    <div id="content" class="fl-col-flex idi-3cols">
+		<h2>Equipment</h2>
+		<ul class="fl-grid">
+			<li><a href="<?php echo get_home_url(); ?>/booking/equipment/keyboards"><img src="<?php bloginfo('stylesheet_directory');?>/images/people/peopleplaceholder.png"/>Keyboards</a></li>
+			<li><a href="<?php echo get_home_url(); ?>/booking/equipment/pointing-devices"><img src="<?php bloginfo('stylesheet_directory');?>/images/people/peopleplaceholder.png"/>Pointing devices</a></li>
+			<li><a href="<?php echo get_home_url(); ?>/booking/equipment/displays"><img src="<?php bloginfo('stylesheet_directory');?>/images/people/peopleplaceholder.png"/>Displays</a></li>
+			<li><a href="<?php echo get_home_url(); ?>/booking/equipment/magnifiers"><img src="<?php bloginfo('stylesheet_directory');?>/images/people/peopleplaceholder.png"/>Magnifiers</a></li>
+			<li><a href="<?php echo get_home_url(); ?>/booking/equipment/cameras"><img src="<?php bloginfo('stylesheet_directory');?>/images/people/peopleplaceholder.png"/>Cameras</a></li>
+		</ul>
+	</div>
+</div>
+<?php else: ?>
+	<p>You must login to view this content.</p>
+<?php endif; ?>
+		
+<?php get_footer(); ?>
diff --git a/functions.php b/functions.php
index 2f1b2cd..a1d3d82 100644
--- a/functions.php
+++ b/functions.php
@@ -13,21 +13,21 @@
  *  Add IDI-specific JS files to the header
  */
 function add_idi_files() {
-	$baseurl = get_stylesheet_directory_uri();
-	
-	// The font fix for Chrome and Firefox on windows
-	// Lato font is too light to read with chrome on windows, use arial/helvetica instead
-	$userAgent = strtolower($_SERVER['HTTP_USER_AGENT']);
-	if (strpos($userAgent, "windows") && (strpos($userAgent, "chrome") || strpos($userAgent, "firefox"))) {
-		echo '<link rel="stylesheet" type="text/css" media="all" href="'. $baseurl. '/style-windows.css" />'. "\n";
-	}
-	
-	echo '<script type="text/javascript" src="' . $baseurl . '/lib/parallax-scrolling.js" ></script>' . "\n";
-	echo '<script type="text/javascript" src="' . $baseurl . '/idi.js" ></script>' . "\n";	
-	echo '<!--[if lt IE 8]>'  . "\n";
-	echo '<script type="text/javascript" src="' . $baseurl . '/idi-ltie8.js" ></script>' . "\n";
-	echo '<![endif]-->'  . "\n";
-	
+    $baseurl = get_stylesheet_directory_uri();
+    
+    // The font fix for Chrome and Firefox on windows
+    // Lato font is too light to read with chrome on windows, use arial/helvetica instead
+    $userAgent = strtolower($_SERVER['HTTP_USER_AGENT']);
+    if (strpos($userAgent, "windows") && (strpos($userAgent, "chrome") || strpos($userAgent, "firefox"))) {
+        echo '<link rel="stylesheet" type="text/css" media="all" href="'. $baseurl. '/style-windows.css" />'. "\n";
+    }
+    
+    echo '<script type="text/javascript" src="' . $baseurl . '/lib/parallax-scrolling.js" ></script>' . "\n";
+    echo '<script type="text/javascript" src="' . $baseurl . '/idi.js" ></script>' . "\n";  
+    echo '<!--[if lt IE 8]>'  . "\n";
+    echo '<script type="text/javascript" src="' . $baseurl . '/idi-ltie8.js" ></script>' . "\n";
+    echo '<![endif]-->'  . "\n";
+    
 }
 add_action('wp_head', 'add_idi_files');
 
@@ -35,8 +35,8 @@ function add_idi_files() {
  * Customize the 'more' link at the end of a post excerpt
  */
 function idi_excerpt_more($more) {
-	global $post;
-	return '<p><a class="idi-more idi-no-tab-focus" title="'. $post->post_title .'" alt="'. $post->post_title .'" href="'. get_permalink($post->ID) . '">read article</a></p>';
+    global $post;
+    return '<p><a class="idi-more idi-no-tab-focus" title="'. $post->post_title .'" alt="'. $post->post_title .'" href="'. get_permalink($post->ID) . '">read article</a></p>';
 
 }
 add_filter('excerpt_more', 'idi_excerpt_more');
@@ -45,18 +45,18 @@ function idi_excerpt_more($more) {
  * Brand the login page with IDI-specific styling
  */
 function brand_login_page() {
-	echo '<link rel="stylesheet" type="text/css" media="all" href="'. get_stylesheet_directory_uri() .'/login-page.css" />';
-	echo '<script type="text/javascript" src="' . get_template_directory_uri() .'/infusion/MyInfusion.js"></script>';
-	echo '<script type="text/javascript">
-		function loginalt() {
-			var logoLink = $("#login a");
-			logoLink.attr({
-				href: "' . site_url() . '",
-				title: "' . get_bloginfo('name') . '"
-			});
-		}
-	window.onload=loginalt;
-	</script>';
+    echo '<link rel="stylesheet" type="text/css" media="all" href="'. get_stylesheet_directory_uri() .'/login-page.css" />';
+    echo '<script type="text/javascript" src="' . get_template_directory_uri() .'/infusion/MyInfusion.js"></script>';
+    echo '<script type="text/javascript">
+        function loginalt() {
+            var logoLink = $("#login a");
+            logoLink.attr({
+                href: "' . site_url() . '",
+                title: "' . get_bloginfo('name') . '"
+            });
+        }
+    window.onload=loginalt;
+    </script>';
 }
 add_action('login_head', 'brand_login_page');
 
@@ -65,33 +65,33 @@ function loginalt() {
  * Determines if the current page or post is a descendent of the given page
  */
 function is_tree($pid) {      // $pid = The ID of the page we're looking for pages underneath
-	global $post;         // load details about this page
-	$anc = get_post_ancestors( $post->ID );
-	foreach($anc as $ancestor) {
-		if(is_page() && $ancestor == $pid) {
-			return true;
-		}
-	}
-	if(is_page()&&(is_page($pid)))
+    global $post;         // load details about this page
+    $anc = get_post_ancestors( $post->ID );
+    foreach($anc as $ancestor) {
+        if(is_page() && $ancestor == $pid) {
+            return true;
+        }
+    }
+    if(is_page()&&(is_page($pid)))
                return true;   // we're at the page or at a sub page
-	else
+    else
                return false;  // we're elsewhere
 };
 
 function idi_generate_top_nav() {
-	$pages = get_pages( array ('parent' => '0', 'sort_column' => 'menu_order'));
-	$out = "<ul>";
-	foreach ( $pages as $pagg ) {
-		$out .= '<li><a class="idi-nav-' . $pagg->post_name;
-		if (is_tree($pagg->ID)) {
-			$out .= ' current_page_item';
-		}
-		$out .= '" href="' . get_page_link($pagg->ID) . '">';
+    $pages = get_pages( array ('parent' => '0', 'sort_column' => 'menu_order'));
+    $out = "<ul>";
+    foreach ( $pages as $pagg ) {
+        $out .= '<li><a class="idi-nav-' . $pagg->post_name;
+        if (is_tree($pagg->ID)) {
+            $out .= ' current_page_item';
+        }
+        $out .= '" href="' . get_page_link($pagg->ID) . '">';
         $out .= $pagg->post_name . '</a></li>';
-	}
-	$out .= "</ul>";
+    }
+    $out .= "</ul>";
 
-	echo $out;
+    echo $out;
 }
 
 /**
@@ -100,11 +100,32 @@ function idi_generate_top_nav() {
  *  section.
  */
 function remove_parent_contentID() {
-	echo '<script type="text/javascript">' . "\n";
+    echo '<script type="text/javascript">' . "\n";
     echo '$(document).ready(function () {' . "\n";
-    echo '	$(".fl-site-main-body[id=\'content\']").removeAttr("id");' . "\n";
+    echo '  $(".fl-site-main-body[id=\'content\']").removeAttr("id");' . "\n";
     echo '});' . "\n";
-	echo '</script>' . "\n";
+    echo '</script>' . "\n";
+}
+
+
+/**
+ * Stay on login panel when login errors occur, instead of redirecting to login screen
+ */
+add_action( 'wp_login_failed', 'panel_login_fail' );  // hook failed login
+
+function panel_login_fail( $username ) {
+    $referrer = $_SERVER['HTTP_REFERER'];  
+    
+    // if there's a valid referrer, and it's not the default log-in screen
+    if ( !empty($referrer) && !strstr($referrer,'wp-login') && !strstr($referrer,'wp-admin') ) {
+        $referrer = explode('?', $referrer);
+        parse_str($referrer[1], $referrer_args);        
+        unset($referrer_args['idilogout']); 	//unset old idilogout arg if set
+        $referrer_args['idilogin'] = "failed"; 	//let theme know there are errors     
+        
+        wp_redirect( $referrer[0]."?".http_build_query($referrer_args) ); 
+        exit;
+    }
 }
 
 ?>
diff --git a/idi.js b/idi.js
index c250e68..e13da33 100644
--- a/idi.js
+++ b/idi.js
@@ -17,6 +17,14 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 var idi = idi || {};
 
 (function ($) {
+    idi.setUpBookingFaq = function () {
+        var faqShowHide = $('.idi-booking-faq-show-hide');
+        faqShowHide.click(function () {
+            $('.idi-booking-faq').toggleClass("idi-booking-faq-hidden").toggleClass("idi-booking-faq-shown");
+            faqShowHide.toggleClass("idi-booking-faq-show").toggleClass("idi-booking-faq-hide");
+        });
+    };
+
     idi.makeTopNavSticky = function () {
         var theWindow = $(window);
 
@@ -49,6 +57,7 @@ var idi = idi || {};
         loginToggleBtn: ".idi-slidingPanel-toggleButton",
         UIOToggleButton: '.flc-slidingPanel-toggleButton',
         loginForm: ".idi-login-form",
+        logoutText: ".idi-logout-text",
         mailingList: {
             form: ".idi-mailing-list-signup",
             loading: ".idi-loading",
@@ -61,27 +70,6 @@ var idi = idi || {};
         }
     };
 
-    idi.setUpLoginOutPanel = function () {
-        fluid.slidingPanel(idi.selectors.loginContainer, {
-            selectors: {
-                panel: idi.selectors.loginPanel,
-                toggleButton: idi.selectors.loginToggleBtn
-            },
-            strings: {
-                showText: "Login",
-                hideText: "Login"
-            },
-            listeners: {
-                onPanelShow: function () {
-                    // close UIO panel if it was open
-                    idi.closeOpenedPanel($(idi.selectors.UIOiFrame), $(idi.selectors.UIOToggleButton));
-                }
-            }
-        });
-        $(idi.selectors.loginPanel).hide();
-        $(idi.selectors.loginForm).show();
-    };
-
     idi.mailingListSignup = function () {
         var form = $(idi.selectors.mailingList.form);
         var loading = $(idi.selectors.mailingList.loading);
@@ -128,7 +116,8 @@ var idi = idi || {};
     $(document).ready(function () {
         idi.setUpLoginOutPanel();
         idi.makeTopNavSticky();
-        idi.keyboardA11y();
+        idi.setUpBookingFaq();
+        idi.keyboardA11y();        
     });
 
     fluid.demands("fluid.slidingPanel", ["fluid.uiOptions", "fluid.uiEnhancer"], {
diff --git a/images/arrows/arrow-down-black.png b/images/arrows/arrow-down-black.png
new file mode 100644
index 0000000..18830cb
Binary files /dev/null and b/images/arrows/arrow-down-black.png differ
diff --git a/images/arrows/arrow-down-hover.png b/images/arrows/arrow-down-hover.png
new file mode 100644
index 0000000..92314fe
Binary files /dev/null and b/images/arrows/arrow-down-hover.png differ
diff --git a/images/arrows/arrow-down-white.png b/images/arrows/arrow-down-white.png
new file mode 100644
index 0000000..e4bf71b
Binary files /dev/null and b/images/arrows/arrow-down-white.png differ
diff --git a/images/arrows/arrow-down-yellow.png b/images/arrows/arrow-down-yellow.png
new file mode 100644
index 0000000..498b7dc
Binary files /dev/null and b/images/arrows/arrow-down-yellow.png differ
diff --git a/images/arrows/arrow-down.png b/images/arrows/arrow-down.png
new file mode 100644
index 0000000..cbcdd0a
Binary files /dev/null and b/images/arrows/arrow-down.png differ
diff --git a/images/arrows/arrow-up-black.png b/images/arrows/arrow-up-black.png
new file mode 100644
index 0000000..a492b13
Binary files /dev/null and b/images/arrows/arrow-up-black.png differ
diff --git a/images/arrows/arrow-up-hover.png b/images/arrows/arrow-up-hover.png
new file mode 100644
index 0000000..8507d2c
Binary files /dev/null and b/images/arrows/arrow-up-hover.png differ
diff --git a/images/arrows/arrow-up-white.png b/images/arrows/arrow-up-white.png
new file mode 100644
index 0000000..60a4a38
Binary files /dev/null and b/images/arrows/arrow-up-white.png differ
diff --git a/images/arrows/arrow-up-yellow.png b/images/arrows/arrow-up-yellow.png
new file mode 100644
index 0000000..f9d48ac
Binary files /dev/null and b/images/arrows/arrow-up-yellow.png differ
diff --git a/images/arrows/arrow-up.png b/images/arrows/arrow-up.png
new file mode 100644
index 0000000..24c970e
Binary files /dev/null and b/images/arrows/arrow-up.png differ
diff --git a/images/bookingsteps/bookingsteps-black.png b/images/bookingsteps/bookingsteps-black.png
new file mode 100644
index 0000000..546c830
Binary files /dev/null and b/images/bookingsteps/bookingsteps-black.png differ
diff --git a/images/bookingsteps/bookingsteps-white.png b/images/bookingsteps/bookingsteps-white.png
new file mode 100644
index 0000000..54a2fd8
Binary files /dev/null and b/images/bookingsteps/bookingsteps-white.png differ
diff --git a/images/bookingsteps/bookingsteps-yellow.png b/images/bookingsteps/bookingsteps-yellow.png
new file mode 100644
index 0000000..8af4410
Binary files /dev/null and b/images/bookingsteps/bookingsteps-yellow.png differ
diff --git a/images/bookingsteps/bookingsteps.png b/images/bookingsteps/bookingsteps.png
new file mode 100644
index 0000000..6effb96
Binary files /dev/null and b/images/bookingsteps/bookingsteps.png differ
diff --git a/infrastructure.php b/infrastructure.php
index 130e79f..eda143a 100644
--- a/infrastructure.php
+++ b/infrastructure.php
@@ -6,12 +6,8 @@
 <?php get_header(); ?>
 
 <div class="fl-centered fl-col-mixed fl-site-wrapper idi-infra">
-	<div class="fl-container-flex fl-col-flex4">
-		<div class="fl-col"></div>
-		<div class="fl-col idi-3cols">
-			<h1>Equipment and space booking, calendaring, and more coming soon.</h1>
-		</div>
-	</div>
+
+
 	
 <!--
 	<div class="fl-container-flex fl-col-flex4 idi-infra-row">
@@ -27,7 +23,82 @@
 		</div>
 	</div>
 -->
-	
+	<div class="fl-container-flex fl-col-flex4 idi-infra-row">
+		<section>
+			<div class="fl-col">
+				<h2 class="idi-summary-title idi-booking-title">Book Equipment</h2>
+			</div>
+			<div class="fl-col-flex">
+			<?php if ( is_user_logged_in() ): ?>
+			
+			<div class="fl-col-flex3">
+				<div class="fl-col idi-booking-step">
+					<div class="idi-booking-step-icon idi-booking-step-1"></div>
+					<h3>Get form:</h3>
+					<a class="idi-booking-download" href="../wp-content/themes/idi-theme/idi-booking-form.pdf">download <span class="fl-hidden-accessible">the equipment booking form</span></a>
+				</div>
+				<div class="fl-col idi-booking-step">
+					<div class="idi-booking-step-icon idi-booking-step-2"></div>
+					<h3>Complete</h3>
+					fill-out fields &amp; sign
+				</div>
+				<div class="fl-col idi-booking-step">
+					<div class="idi-booking-step-icon idi-booking-step-3"></div>
+					<h3>Return to:</h3>
+					<a class="idi-booking-email" href="mailto:idi@ocadu.ca" title="Equipment loan request"><span class="fl-hidden-accessible">return the form to</span> idi@ocadu.ca</a>
+				</div>
+			</div>	
+				<section>
+					<div class="fl-push idi-booking-summary">
+						<p>Partner institutions can borrow a range of hardware and software from the Inclusive Design Institute.
+						To request equipment, download the Equipment Booking form (an editable PDF), fill it out (either by hand or using the computer) and return it to the IDI (by mail, email, fax, or in person).</p>
+						<h3><a class="idi-booking-faq-show-hide idi-booking-faq-show">Frequently Asked Questions</a></h3>
+						<section>
+							<div class="idi-booking-faq idi-booking-faq-hidden">
+								<div class="idi-booking-faq-item">
+									<div class="idi-booking-faq-question"><h4>What can I borrow?</h4></div>
+									<div class="idi-booking-faq-answer">See the <a href="<?php echo get_home_url(); ?>/booking/equipment">IDI Equipment list</a> for information.</div>
+								</div>
+								<div class="idi-boooking-faq-item">
+									<div class="idi-booking-faq-question"><h4>How long can I borrow it for?</h4></div>
+									<div class="idi-booking-faq-answer">Equipment and software can be borrowed for up to three months.</div>
+								</div>
+								<div class="idi-booking-faq-item">
+									<div class="idi-booking-faq-question"><h4>How far in advance do I have to ask for it?</h4></div>
+									<div class="idi-booking-faq-answer">We require a minimum of two days notice, to ensure availability. In exceptional circumstances, it is possible that even with two days notice, some items might not be available.</div>
+								</div>
+								<div class="idi-booking-faq-item">
+									<div class="idi-booking-faq-question"><h4>How will I get it?</h4></div>
+									<div class="idi-booking-faq-answer">Equipment will be shipped via courier, billed to the borrower's account.</div>
+								</div>
+								<div class="idi-booking-faq-item">
+									<div class="idi-booking-faq-question"><h4>Where would I pick it up from?</h4></div>
+									<div class="idi-booking-faq-answer">If you wish, you can arrange to pick the equipment up in person from 205 Richmond St. W. (2nd floor), Toronto.</div>
+								</div>
+								<div class="idi-booking-faq-item">
+									<div class="idi-booking-faq-question"><h4>How should I return it?</h4></div>
+									<div class="idi-booking-faq-answer">You must ship the material using the same method it was delivered to you, or you can return it in person. If you will be returning it in person, please contact the IDI to arrange a time.</div>
+								</div>
+								<div class="idi-booking-faq-item">
+									<div class="idi-booking-faq-question"><h4>Can I make a copy of software?</h4></div>
+									<div class="idi-booking-faq-answer">No. You must agree not to duplicate software, and to uninstall it from your computer once you return the original discs.</div>
+								</div>
+								<div class="idi-booking-faq-item">
+									<div class="idi-booking-faq-question"><h4>How should I uninstall software when I'm finished?</h4></div>
+									<div class="idi-booking-faq-answer">Some software requires a particular process to uninstall. You will receive instructions with the software.</div>
+								</div>
+							</div>
+						</section>
+					</div>
+				</section>
+			</div>					
+			<?php else: ?>
+				<p>Partner institutions can borrow a range of hardware and software from the Inclusive Design Institute.</p>
+				<p>If you belong to a partner institution, please login via the "login" tab at the top of the page to view booking information. If you need an account set up, please <a href="mailto:idi@ocadu.ca">contact us</a>.</p>
+			<?php endif; ?>			
+		</section>
+	</div>
+
 	<div class="fl-container-flex fl-col-flex4 idi-infra-row">
 		<section>
 			<div class="fl-col">
diff --git a/sidebar-equipment-categories.php b/sidebar-equipment-categories.php
new file mode 100644
index 0000000..d7e7b6e
--- /dev/null
+++ b/sidebar-equipment-categories.php
@@ -0,0 +1,13 @@
+<div class="idi-equipment-categories fl-push">
+	<h3>Categories</h3>
+	<ul>
+		<li><a href="<?php echo get_home_url(); ?>/booking/equipment/keyboards">Keyboards</a></li>
+		<li><a href="<?php echo get_home_url(); ?>/booking/equipment/pointing-devices">Pointing devices</a></li>
+		<li><a href="<?php echo get_home_url(); ?>/booking/equipment/displays">Displays</a></li>
+		<li>Magnifiers</li>
+		<li>Cameras</li>
+	</ul>
+</div>
+
+
+
diff --git a/sidebar-equipment.php b/sidebar-equipment.php
new file mode 100644
index 0000000..cea6af9
--- /dev/null
+++ b/sidebar-equipment.php
@@ -0,0 +1,19 @@
+
+<div class="idi-booking-step fl-push">
+	<div class="idi-booking-step-icon idi-booking-step-1"></div>
+	<h3>Get form:</h3>
+	<a class="idi-booking-download" href="../wp-content/themes/idi-theme/idi-booking-form.pdf">download <span class="fl-hidden-accessible">the equipment booking form</span></a>
+</div>
+<div class="idi-booking-step fl-push">
+	<div class="idi-booking-step-icon idi-booking-step-2"></div>
+	<h3>Complete</h3>
+	fill-out fields &amp; sign
+</div>
+<div class="idi-booking-step fl-push">
+	<div class="idi-booking-step-icon idi-booking-step-3"></div>
+	<h3>Return to:</h3>
+	<a class="idi-booking-email" href="mailto:idi@ocadu.ca" title="Equipment loan request"><span class="fl-hidden-accessible">return the form to</span> idi@ocadu.ca</a>
+</div>
+
+
+
diff --git a/style-ltie7.css b/style-ltie7.css
index 3b9e2fb..b405ec6 100644
--- a/style-ltie7.css
+++ b/style-ltie7.css
@@ -258,12 +258,12 @@ body {
 .fl-site-nav-main a.idi-nav-research:focus {
     background-image: none;
 }
-.fl-site-nav-main ul a.idi-nav-infrastructure {
+.fl-site-nav-main ul a.idi-nav-booking {
     background-image: none;
     padding-left: 5px;
 }
-.fl-site-nav-main a.idi-nav-infrastructure:hover,
-.fl-site-nav-main a.idi-nav-infrastructure:focus {
+.fl-site-nav-main a.idi-nav-booking:hover,
+.fl-site-nav-main a.idi-nav-booking:focus {
     background-image: none;
 }
 
@@ -367,18 +367,18 @@ body {
     background-image: none; 
 }
 
-.fl-site-nav-main .current_page_item.idi-nav-infrastructure, .fl-site-nav-main .current_page_item.idi-nav-infrastructure:hover, .fl-site-nav-main .current_page_item.idi-nav-infrastructure:focus,
-.fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-infrastructure, .fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-infrastructure:hover, .fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-infrastructure:focus,
-.fl-theme-uio-wb .fl-site-nav-main .idi-nav-infrastructure, .fl-theme-uio-wb .fl-site-nav-main .idi-nav-infrastructure:hover, .fl-theme-uio-wb .fl-site-nav-main .idi-nav-infrastructure:focus { 
+.fl-site-nav-main .current_page_item.idi-nav-booking, .fl-site-nav-main .current_page_item.idi-nav-booking:hover, .fl-site-nav-main .current_page_item.idi-nav-booking:focus,
+.fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-booking, .fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-booking:hover, .fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-booking:focus,
+.fl-theme-uio-wb .fl-site-nav-main .idi-nav-booking, .fl-theme-uio-wb .fl-site-nav-main .idi-nav-booking:hover, .fl-theme-uio-wb .fl-site-nav-main .idi-nav-booking:focus { 
     background-image: none; 
 }
-.fl-theme-uio-bw .fl-site-nav-main .idi-nav-infrastructure, .fl-theme-uio-bw .fl-site-nav-main .idi-nav-infrastructure:hover, .fl-theme-uio-bw .fl-site-nav-main .idi-nav-infrastructure:focus,
-.fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-infrastructure, .fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-infrastructure:hover, .fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-infrastructure:focus,
-.fl-theme-uio-by .fl-site-nav-main .idi-nav-infrastructure, .fl-theme-uio-by .fl-site-nav-main .idi-nav-infrastructure:hover, .fl-theme-uio-by .fl-site-nav-main .idi-nav-infrastructure:focus,
-.fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-infrastructure, .fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-infrastructure:hover, .fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-infrastructure:focus { 
+.fl-theme-uio-bw .fl-site-nav-main .idi-nav-booking, .fl-theme-uio-bw .fl-site-nav-main .idi-nav-booking:hover, .fl-theme-uio-bw .fl-site-nav-main .idi-nav-booking:focus,
+.fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-booking, .fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-booking:hover, .fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-booking:focus,
+.fl-theme-uio-by .fl-site-nav-main .idi-nav-booking, .fl-theme-uio-by .fl-site-nav-main .idi-nav-booking:hover, .fl-theme-uio-by .fl-site-nav-main .idi-nav-booking:focus,
+.fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-booking, .fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-booking:hover, .fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-booking:focus { 
     background-image: none; 
 }
-.fl-theme-uio-yb .fl-site-nav-main .idi-nav-infrastructure, .fl-theme-uio-yb .fl-site-nav-main .idi-nav-infrastructure:hover, .fl-theme-uio-yb .fl-site-nav-main .idi-nav-infrastructure:focus,
-.fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-infrastructure, .fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-infrastructure:hover, .fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-infrastructure:focus { 
+.fl-theme-uio-yb .fl-site-nav-main .idi-nav-booking, .fl-theme-uio-yb .fl-site-nav-main .idi-nav-booking:hover, .fl-theme-uio-yb .fl-site-nav-main .idi-nav-booking:focus,
+.fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-booking, .fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-booking:hover, .fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-booking:focus { 
     background-image: none; 
 }
diff --git a/style-ltie8.css b/style-ltie8.css
new file mode 100644
index 0000000..e71673f
--- /dev/null
+++ b/style-ltie8.css
@@ -0,0 +1,3 @@
+.idi-booking-faq-show-hide {
+    width: 14.5em;
+}
\ No newline at end of file
diff --git a/style-ltie9.css b/style-ltie9.css
index 10ababf..aff0252 100644
--- a/style-ltie9.css
+++ b/style-ltie9.css
@@ -90,12 +90,12 @@
 .fl-site-nav-main a.idi-nav-research:focus {
     background-image: url('images/navigation-small/research-hover.png');
 }
-.fl-site-nav-main ul a.idi-nav-infrastructure {
+.fl-site-nav-main ul a.idi-nav-booking {
     background-image: url('images/navigation-small/infrastructure.png');
     padding-left: 25px;
 }
-.fl-site-nav-main a.idi-nav-infrastructure:hover,
-.fl-site-nav-main a.idi-nav-infrastructure:focus {
+.fl-site-nav-main a.idi-nav-booking:hover,
+.fl-site-nav-main a.idi-nav-booking:focus {
     background-image: url('images/navigation-small/infrastructure-hover.png');
 }
 
@@ -204,19 +204,19 @@
     background-image: url('images/navigation-small/research-yellow.png'); 
 }
 
-.fl-site-nav-main .current_page_item.idi-nav-infrastructure, .fl-site-nav-main .current_page_item.idi-nav-infrastructure:hover, .fl-site-nav-main .current_page_item.idi-nav-infrastructure:focus,
-.fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-infrastructure, .fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-infrastructure:hover, .fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-infrastructure:focus,
-.fl-theme-uio-wb .fl-site-nav-main .idi-nav-infrastructure, .fl-theme-uio-wb .fl-site-nav-main .idi-nav-infrastructure:hover, .fl-theme-uio-wb .fl-site-nav-main .idi-nav-infrastructure:focus { 
+.fl-site-nav-main .current_page_item.idi-nav-booking, .fl-site-nav-main .current_page_item.idi-nav-booking:hover, .fl-site-nav-main .current_page_item.idi-nav-booking:focus,
+.fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-booking, .fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-booking:hover, .fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-booking:focus,
+.fl-theme-uio-wb .fl-site-nav-main .idi-nav-booking, .fl-theme-uio-wb .fl-site-nav-main .idi-nav-booking:hover, .fl-theme-uio-wb .fl-site-nav-main .idi-nav-booking:focus { 
     background-image: url('images/navigation-small/infrastructure-white.png'); 
 }
-.fl-theme-uio-bw .fl-site-nav-main .idi-nav-infrastructure, .fl-theme-uio-bw .fl-site-nav-main .idi-nav-infrastructure:hover, .fl-theme-uio-bw .fl-site-nav-main .idi-nav-infrastructure:focus,
-.fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-infrastructure, .fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-infrastructure:hover, .fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-infrastructure:focus,
-.fl-theme-uio-by .fl-site-nav-main .idi-nav-infrastructure, .fl-theme-uio-by .fl-site-nav-main .idi-nav-infrastructure:hover, .fl-theme-uio-by .fl-site-nav-main .idi-nav-infrastructure:focus,
-.fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-infrastructure, .fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-infrastructure:hover, .fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-infrastructure:focus { 
+.fl-theme-uio-bw .fl-site-nav-main .idi-nav-booking, .fl-theme-uio-bw .fl-site-nav-main .idi-nav-booking:hover, .fl-theme-uio-bw .fl-site-nav-main .idi-nav-booking:focus,
+.fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-booking, .fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-booking:hover, .fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-booking:focus,
+.fl-theme-uio-by .fl-site-nav-main .idi-nav-booking, .fl-theme-uio-by .fl-site-nav-main .idi-nav-booking:hover, .fl-theme-uio-by .fl-site-nav-main .idi-nav-booking:focus,
+.fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-booking, .fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-booking:hover, .fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-booking:focus { 
     background-image: url('images/navigation-small/infrastructure-black.png'); 
 }
-.fl-theme-uio-yb .fl-site-nav-main .idi-nav-infrastructure, .fl-theme-uio-yb .fl-site-nav-main .idi-nav-infrastructure:hover, .fl-theme-uio-yb .fl-site-nav-main .idi-nav-infrastructure:focus,
-.fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-infrastructure, .fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-infrastructure:hover, .fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-infrastructure:focus { 
+.fl-theme-uio-yb .fl-site-nav-main .idi-nav-booking, .fl-theme-uio-yb .fl-site-nav-main .idi-nav-booking:hover, .fl-theme-uio-yb .fl-site-nav-main .idi-nav-booking:focus,
+.fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-booking, .fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-booking:hover, .fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-booking:focus { 
     background-image: url('images/navigation-small/infrastructure-yellow.png'); 
 }
 
@@ -450,3 +450,7 @@
     position: absolute;
     z-index: 2;
 }
+
+.idi-booking-faq-show-hide {
+    width: 17em;
+}
\ No newline at end of file
diff --git a/style.css b/style.css
index 5450ca2..df68360 100644
--- a/style.css
+++ b/style.css
@@ -49,7 +49,8 @@ a:focus,
 .fl-site-link a:focus,
 .fl-site-nav-main a:focus,
 .fl-uiOptions-fatPanel .fl-toggleButton:focus, 
-.idi-cluster-name:focus {
+.idi-cluster-name:focus,
+.idi-booking-step a.idi-booking-download:focus {
     border: 2px solid #FFCC00;
     outline: none;
 }
@@ -402,12 +403,12 @@ h3,
 .fl-site-nav-main a.idi-nav-research:focus {
     background-image: url('images/navigation/research-hover.png');
 }
-.fl-site-nav-main a.idi-nav-infrastructure {
+.fl-site-nav-main a.idi-nav-booking {
     background-image: url('images/navigation/infrastructure.png');
     padding-left: 1.8em;
 }
-.fl-site-nav-main a.idi-nav-infrastructure:hover,
-.fl-site-nav-main a.idi-nav-infrastructure:focus {
+.fl-site-nav-main a.idi-nav-booking:hover,
+.fl-site-nav-main a.idi-nav-booking:focus {
     background-image: url('images/navigation/infrastructure-hover.png');
 }
 
@@ -510,19 +511,19 @@ h3,
     background-image: url('images/navigation/research-yellow.png'); 
 }
 
-.fl-site-nav-main .current_page_item.idi-nav-infrastructure, .fl-site-nav-main .current_page_item.idi-nav-infrastructure:hover, .fl-site-nav-main .current_page_item.idi-nav-infrastructure:focus,
-.fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-infrastructure, .fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-infrastructure:hover, .fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-infrastructure:focus,
-.fl-theme-uio-wb .fl-site-nav-main .idi-nav-infrastructure, .fl-theme-uio-wb .fl-site-nav-main .idi-nav-infrastructure:hover, .fl-theme-uio-wb .fl-site-nav-main .idi-nav-infrastructure:focus { 
+.fl-site-nav-main .current_page_item.idi-nav-booking, .fl-site-nav-main .current_page_item.idi-nav-booking:hover, .fl-site-nav-main .current_page_item.idi-nav-booking:focus,
+.fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-booking, .fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-booking:hover, .fl-theme-uio-bw .fl-site-nav-main .current_page_item.idi-nav-booking:focus,
+.fl-theme-uio-wb .fl-site-nav-main .idi-nav-booking, .fl-theme-uio-wb .fl-site-nav-main .idi-nav-booking:hover, .fl-theme-uio-wb .fl-site-nav-main .idi-nav-booking:focus { 
     background-image: url('images/navigation/infrastructure-white.png'); 
 }
-.fl-theme-uio-bw .fl-site-nav-main .idi-nav-infrastructure, .fl-theme-uio-bw .fl-site-nav-main .idi-nav-infrastructure:hover, .fl-theme-uio-bw .fl-site-nav-main .idi-nav-infrastructure:focus,
-.fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-infrastructure, .fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-infrastructure:hover, .fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-infrastructure:focus,
-.fl-theme-uio-by .fl-site-nav-main .idi-nav-infrastructure, .fl-theme-uio-by .fl-site-nav-main .idi-nav-infrastructure:hover, .fl-theme-uio-by .fl-site-nav-main .idi-nav-infrastructure:focus,
-.fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-infrastructure, .fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-infrastructure:hover, .fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-infrastructure:focus { 
+.fl-theme-uio-bw .fl-site-nav-main .idi-nav-booking, .fl-theme-uio-bw .fl-site-nav-main .idi-nav-booking:hover, .fl-theme-uio-bw .fl-site-nav-main .idi-nav-booking:focus,
+.fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-booking, .fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-booking:hover, .fl-theme-uio-wb .fl-site-nav-main .current_page_item.idi-nav-booking:focus,
+.fl-theme-uio-by .fl-site-nav-main .idi-nav-booking, .fl-theme-uio-by .fl-site-nav-main .idi-nav-booking:hover, .fl-theme-uio-by .fl-site-nav-main .idi-nav-booking:focus,
+.fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-booking, .fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-booking:hover, .fl-theme-uio-yb .fl-site-nav-main .current_page_item.idi-nav-booking:focus { 
     background-image: url('images/navigation/infrastructure-black.png'); 
 }
-.fl-theme-uio-yb .fl-site-nav-main .idi-nav-infrastructure, .fl-theme-uio-yb .fl-site-nav-main .idi-nav-infrastructure:hover, .fl-theme-uio-yb .fl-site-nav-main .idi-nav-infrastructure:focus,
-.fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-infrastructure, .fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-infrastructure:hover, .fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-infrastructure:focus { 
+.fl-theme-uio-yb .fl-site-nav-main .idi-nav-booking, .fl-theme-uio-yb .fl-site-nav-main .idi-nav-booking:hover, .fl-theme-uio-yb .fl-site-nav-main .idi-nav-booking:focus,
+.fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-booking, .fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-booking:hover, .fl-theme-uio-by .fl-site-nav-main .current_page_item.idi-nav-booking:focus { 
     background-image: url('images/navigation/infrastructure-yellow.png'); 
 }
 
@@ -894,7 +895,7 @@ h3,
 }
 .fl-uiOptions-fatPanel .fl-panelBar {
     margin: auto;
-    width: 64em;
+    max-width: 64em;
     height: 0;
     border: none;
 }
@@ -916,7 +917,6 @@ h3,
     width: 8em;
     margin-top: 0px;
     font-weight: 400;
-    position: absolute;
     left: 875px;  /* Temporary fix for IDI-57: Prefs button getting pushed offscreen when text size is maxed out.  */
 }
 /* these should not be necessary, but defaults not working? */
@@ -944,9 +944,8 @@ h3,
 .fl-theme-uio-bw .idi-uio-button { background-image: url("images/loginandpreferences/preferences-black.png"); }
 .fl-uiOptions-fatPanel .fl-toggleButton.idi-slidingPanel-toggleButton {
     background-image: url("images/loginandpreferences/login.png");
-    width: 4em;
+    width: 5em;
     padding: 5px 5px 5px 25px;
-    position: absolute;
     right: 7.5em;
     background-position: 0.6em 50%;
 }
@@ -962,6 +961,9 @@ a.anchor {
 }
 
 /* Login/out pull-down panel */
+.idi-loggedin {
+	padding: 7px 10px 0px 0px;
+}
 .idi-loginOutPanel {
     background-color: #FFFFFF;
     z-index: 999;
@@ -1023,6 +1025,10 @@ a.anchor {
     color: #005A8C;
     text-shadow: #FFFFFF 0 1px 1px;
 }
+.idi-login-form .error {
+	font-weight: bold;
+	color: red;
+}
 .fl-theme-uio-yb .idi-login-form #wp-submit,
 .fl-theme-uio-wb .idi-login-form #wp-submit { background: #000000; }
 .fl-theme-uio-bw .idi-login-form #wp-submit { background: #FFFFFF; }
@@ -1044,8 +1050,8 @@ a.anchor {
     background-position: 3.5em 0.4em;
 }
 .idi-login-form .idi-login-forgot {
-    width: 10em;
-    background-position: 8.7em 0.4em;
+    width: 11em;
+    background-position: 10em 0.4em;
 }
 
 .fl-theme-uio-yb .idi-login-form .idi-login-extra { background-image: url('images/arrows/arrow-yellow.gif'); }
@@ -1262,7 +1268,8 @@ ol.letters li {
 .idi-people h2,
 .idi-about h2,
 .idi-cluster h2,
-.idi-workshops h2 {
+.idi-workshops h2,
+.idi-equipment h2 {
     font-style: italic;
     color: #3FB66C;
     margin-bottom: .5em;    
@@ -1286,7 +1293,8 @@ ol.letters li {
 .idi-person {
     margin-bottom: 2em;
 }
-.idi-person:after {
+.idi-person:after,
+.idi-equipment-item:after {
     content: "•";
     color: #999999;
     margin-left: 50%;
@@ -1299,7 +1307,8 @@ ol.letters li {
 .fl-theme-uio-wb .idi-person:after { color: #FFFFFF; }
 .fl-theme-uio-by .idi-person:after,
 .fl-theme-uio-bw .idi-person:after { color: #000000; }
-img.idi-people-person {
+img.idi-people-person,
+img.idi-equipment-image {
     float: right;
     margin: 5px;
     width: 100px;
@@ -1442,8 +1451,12 @@ img.idi-people-person {
     padding-left: 0;
 }
 .idi-infra-row {
-    padding-bottom: 2em;
+    padding-top: 2em;
+}
+.idi-infra-row .fl-col-flex {
+	margin-left: 12em;
 }
+
 .idi-infra-item {
     margin-bottom: 2em;
     padding-left: 1.6em;
@@ -1789,3 +1802,166 @@ a.idi-project-link {
 .idi-workshops-sidebar {
     margin-top: 6em;
 }
+
+/* Equipment booking process */
+.idi-infra .fl-col-flex4 .fl-col.idi-booking-step {
+    padding-left: 2em;
+    max-width: 13em;
+    margin-right: 1.5em;
+    font-style: italic;
+    text-align:left;
+}
+.idi-booking-step-icon {
+    background: url('images/bookingsteps/bookingsteps.png') no-repeat left top;
+    width: 75px;
+    height: 75px;
+    float: left;
+}
+.idi-booking-step-2 {
+    background-position: -80px 0;
+}
+.idi-booking-step-3 {
+    background-position: -160px 0;
+}
+.idi-booking-step h3 {
+    margin-bottom: 0.2em;
+    margin-top: 0.5em;
+}
+.idi-booking-step .idi-booking-email {
+    text-decoration: none;
+    font-weight: bold;
+}
+.idi-booking-step .idi-booking-download {
+    background-color: #0075B0;
+    border: 1px solid #0075B0;
+    color: #FFFFFF;
+    border-radius: 5px;
+    padding: 0.1em 0.5em 0.2em;
+    background: -moz-linear-gradient(top, #0292CB, #0075B0);
+    background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#0075B0), to(#0292CB));
+    background: -webkit-linear-gradient(top, #0292CB, #0075B0);
+    background: -ms-linear-gradient(top, #0292CB, #0075B0);
+    background: -o-linear-gradient(top, #0292CB, #0075B0);
+    box-shadow: 0px 0px 2px 0px #FFFFFF inset;
+    text-shadow: #000000 0 1px 1px;
+    text-decoration: none;
+    font-style: normal;
+}
+.idi-booking-step .idi-booking-download:hover {
+    background-color: #0292CB;
+    background: -moz-linear-gradient(top, #00ADE4, #0292CB);
+    background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#0292CB), to(#00ADE4));
+    background: -webkit-linear-gradient(top, #00ADE4, #0292CB);
+    background: -ms-linear-gradient(top, #00ADE4, #0292CB);
+    background: -o-linear-gradient(top, #00ADE4, #0292CB);
+}
+.idi-booking-step .idi-booking-download:active {
+    color: #005A8C;
+    text-shadow: #FFFFFF 0 1px 1px;
+}
+.idi-booking-title {
+    margin-bottom: 0.5em;
+}
+.idi-booking-summary {
+    margin-bottom: 3em;
+}
+.fl-theme-uio-yb .idi-booking-step-icon {
+    background-image: url('images/bookingsteps/bookingsteps-yellow.png');
+}
+.fl-theme-uio-wb .idi-booking-step-icon {
+    background-image: url('images/bookingsteps/bookingsteps-white.png');
+}
+.fl-theme-uio-by .idi-booking-step-icon, .fl-theme-uio-bw .idi-booking-step-icon {
+    background-image: url('images/bookingsteps/bookingsteps-black.png');
+}
+.fl-theme-uio-yb .idi-booking-step .idi-booking-download,
+.fl-theme-uio-wb .idi-booking-step .idi-booking-download { background: #000000; text-shadow: none; }
+.fl-theme-uio-bw .idi-booking-step .idi-booking-download { background: #FFFFFF; text-shadow: none; }
+.fl-theme-uio-by .idi-booking-step .idi-booking-download { background: #FFFF00; text-shadow: none; }
+
+.idi-booking-faq-show-hide {
+    display: block;
+    font-weight: bold;
+    width: 15em;
+    font-style: italic;
+    text-transform: lowercase;    
+    margin-top: 1em;
+    background-repeat: no-repeat;
+    background-position: right 65%;
+    margin-bottom: 1em;
+}
+.idi-booking-faq-show-hide.idi-booking-faq-show:before {
+    content: "show ";
+}
+.idi-booking-faq-show-hide.idi-booking-faq-hide:before {
+    content: "hide ";
+}
+.idi-booking-faq-show-hide:hover {
+    cursor: pointer;
+}
+.idi-booking-faq-show {
+    background-image: url('images/arrows/arrow-down.png');
+}
+.idi-booking-faq-show:hover {
+    background-image: url('images/arrows/arrow-down-hover.png');
+}
+.idi-booking-faq-hide {
+    background-image: url('images/arrows/arrow-up.png');
+}
+.idi-booking-faq-hide:hover {
+    background-image: url('images/arrows/arrow-up-hover.png');
+}
+.idi-booking-faq-question {
+    font-weight: bold;
+}
+.idi-booking-faq-answer {
+    margin-bottom: 0.5em;
+}
+.idi-booking-faq {
+    margin-left: 2em;
+    overflow: hidden;
+    -moz-transition: height .5s;
+    -ms-transition: height .5s;
+    -o-transition: height .5s;
+    -webkit-transition: height .5s;
+    transition: height .5s;
+}
+.idi-booking-faq.idi-booking-faq-hidden {
+    height: 0;
+}
+.idi-booking-faq.idi-booking-faq-shown {
+    height: 32em; /* Taller in Win browsers */
+}
+.fl-theme-uio-yb .idi-booking-faq-show,
+.fl-theme-uio-by .idi-booking-faq-show:hover { background-image: url('images/arrows/arrow-down-yellow.png'); }
+.fl-theme-uio-yb .idi-booking-faq-hide,
+.fl-theme-uio-by .idi-booking-faq-hide:hover { background-image: url('images/arrows/arrow-up-yellow.png'); }
+
+.fl-theme-uio-bw .idi-booking-faq-show,
+.fl-theme-uio-yb .idi-booking-faq-show:hover,
+.fl-theme-uio-wb .idi-booking-faq-show:hover,
+.fl-theme-uio-by .idi-booking-faq-show  { background-image: url('images/arrows/arrow-down-black.png'); }
+.fl-theme-uio-bw .idi-booking-faq-hide,
+.fl-theme-uio-yb .idi-booking-faq-hide:hover,
+.fl-theme-uio-wb .idi-booking-faq-hide:hover,
+.fl-theme-uio-by .idi-booking-faq-hide { background-image: url('images/arrows/arrow-up-black.png'); }
+
+.fl-theme-uio-wb .idi-booking-faq-show,
+.fl-theme-uio-bw .idi-booking-faq-show:hover { background-image: url('images/arrows/arrow-down-white.png'); }
+.fl-theme-uio-wb .idi-booking-faq-hide,
+.fl-theme-uio-bw .idi-booking-faq-hide:hover { background-image: url('images/arrows/arrow-up-white.png'); }
+
+/* Equipment Page */
+.idi-equipment .fl-grid li {
+    width: 32%;
+    text-align: center;
+}
+.idi-equipment-categories {
+    margin-top: 4em;
+}
+.idi-equipment-categories li {
+    list-style: none;
+}
+.idi-equipment-brand {
+    font-style: italic;
+}
diff --git a/uio-markup.php b/uio-markup.php
index 6214c2f..c80c4eb 100644
--- a/uio-markup.php
+++ b/uio-markup.php
@@ -1,40 +1,109 @@
-	<!-- begin markup for UI Options Fat Panel -->
-	<div class="flc-uiOptions-fatPanel fl-uiOptions-fatPanel">        
-		<div id="myUIOptions" class="flc-slidingPanel-panel flc-uiOptions-iframe"></div>     
-		
-<!--
-Disabling login affordance until Booking is available (until then, login not needed except for institution page edits)
-		<div class="idi-slidingPanel-panel idi-loginOutPanel">
-			<div class="idi-login-form fl-centered" style="display: none;">
-				<form method="post" action="<?php echo wp_login_url(get_permalink());?>" id="loginform" name="loginform">
-					<div class="login-username">
-						<label for="user_login">Username</label>
-						<div>
-							<input type="text" placeholder="your username or email" tabindex="10" size="20" value="" class="input" id="user_login" name="log">
-							<br/><div class="idi-login-extra idi-login-signup"><a href="">Sign up</a></div>
-						</div>
-					</div>
-					<div class="login-password">
-						<label for="user_pass">Password</label>
-						<div>
-							<input type="password" placeholder="your password" tabindex="20" size="20" value="" class="input" id="user_pass" name="pwd">
-							<br/><div class="idi-login-extra idi-login-forgot"><a href="<?php echo wp_lostpassword_url(); ?>">Forgot my password</a></div>
-						</div>
-					</div>
-					<div class="login-submit">
-						<input type="submit" tabindex="100" value="Login" class="button-primary" id="wp-submit" name="wp-submit">
-					</div>
-				</form>
-			</div>
-		</div>
--->
-			
-		<div class="fl-panelBar">
-<!--
-Disabling login affordance until Booking is available (until then, login not needed except for institution page edits)
-			<button class="idi-slidingPanel-toggleButton fl-toggleButton idi-loginout">login</button>
--->
-			<button class="flc-slidingPanel-toggleButton fl-toggleButton idi-uio-button">preferences</button>
-		</div>
-	</div>
-	<!-- end markup for UI Options Fat Panel -->
+<script type="text/javascript">
+    idi.setUpLoginOutPanel = function () {
+        var myPanel = fluid.slidingPanel(idi.selectors.loginContainer, {
+            selectors: {
+                panel: idi.selectors.loginPanel,
+                toggleButton: idi.selectors.loginToggleBtn
+            },
+            strings: {
+                <?php if ( is_user_logged_in() ) {
+                    echo 'showText: "Logout", hideText: "Logout"';              
+                } else {
+                    echo 'showText: "Login", hideText: "Login"';
+                }?>
+            },
+            listeners: {
+                onPanelShow: function () {
+                    // close UIO panel if it was open
+                    idi.closeOpenedPanel($(idi.selectors.UIOiFrame), $(idi.selectors.UIOToggleButton));
+                    
+                    <?php if ($_GET['idilogout'] == "true"): ?>
+						$(idi.selectors.loginForm).show();
+				 		$(idi.selectors.logoutText).hide();                    
+				 	<?php endif; ?>	
+                }
+            }
+        });              
+
+		<?php if ($_GET['idilogout'] == "true"): ?>		//Logout has reloaded page, open panel with logout confirmation
+			$(idi.selectors.loginPanel).show();
+        	$(idi.selectors.logoutText).show(); 
+        	myPanel.model.isShowing = true;  
+        	      
+		<?php elseif ($_GET['idilogin'] == "failed"): ?>//Login errors, open panel with login form and errors
+        	$(idi.selectors.loginPanel).show();
+        	$(idi.selectors.loginForm).show();
+			myPanel.model.isShowing = true;        	         	
+        	
+        <?php else: ?>									//Default behaviour
+	        $(idi.selectors.loginPanel).hide();
+    	    $(idi.selectors.loginForm).show();    	    
+        <?php endif; ?>  
+    	
+    	
+    	//Events      	                    
+		$('.idi-logout').on('keypress mousedown', function() { //Logout button
+				$(idi.selectors.loginPanel).hide();                                   
+	            $(idi.selectors.loginForm).hide();           
+        });        
+        
+		$('.idi-login-link').on('keypress mousedown', function() {	//Login link within logout text
+			$(idi.selectors.logoutText).hide();
+			$(idi.selectors.loginForm).show();			
+		});           	           
+		        
+    };
+      
+</script>    
+    <!-- begin markup for UI Options Fat Panel -->
+    <div class="flc-uiOptions-fatPanel fl-uiOptions-fatPanel">        
+        <div id="myUIOptions" class="flc-slidingPanel-panel flc-uiOptions-iframe"></div>     
+        
+        <div class="idi-slidingPanel-panel idi-loginOutPanel">
+                
+            <div class="idi-logout-text fl-text-align-center" style="display: none;">             
+                <p>You have been successfully logged out. <a href="#" class="idi-login-link">Login</a>.</p>                                                                     
+            </div>
+
+            <div class="idi-login-form fl-centered " style="display: none;">
+            	<?php if ($_GET['idilogin'] == "failed") { ?>
+            		<p class="error fl-text-align-center">Invalid username or password.</p>
+            	<?php } ?>
+                <form method="post" action="<?php echo wp_login_url(get_permalink());?>" id="loginform" name="loginform">
+                    <div class="login-username">
+                        <label for="user_login">Username</label>
+                        <div>
+                            <input type="text" placeholder="your username or email" tabindex="10" size="20" value="" class="input" id="user_login" name="log">
+                            <!-- br/><div class="idi-login-extra idi-login-signup"><a href="">Sign up</a></div -->
+                        </div>
+                    </div>
+                    <div class="login-password">
+                        <label for="user_pass">Password</label>
+                        <div>
+                            <input type="password" placeholder="your password" tabindex="20" size="20" value="" class="input" id="user_pass" name="pwd">
+                            <br/><div class="idi-login-extra idi-login-forgot"><a href="<?php echo wp_lostpassword_url(); ?>">Forgot my password</a></div>
+                        </div>
+                    </div>
+                    <div class="login-submit">
+                        <input type="submit" tabindex="100" value="Login" class="button-primary" id="wp-submit" name="wp-submit">
+                    </div>
+                </form>
+            </div>
+        </div> 
+            
+        <div class="fl-panelBar">
+            <button class="flc-slidingPanel-toggleButton fl-toggleButton idi-uio-button">Preferences</button>           
+                                    
+            <?php if ( is_user_logged_in() ): 
+                global $current_user;
+                get_currentuserinfo(); ?>
+                
+                <a href="<?php echo wp_logout_url(add_query_arg( 'idilogout', 'true', get_permalink())); ?>" class="idi-logout fl-force-right"><button class="idi-slidingPanel-toggleButton fl-toggleButton idi-loginout">Login</button></a>                
+                <div class="fl-force-right idi-loggedin">Logged in as <strong><?php echo  $current_user->user_login; ?></strong></div>  
+                
+            <?php else: ?>          
+                <button class="idi-slidingPanel-toggleButton fl-toggleButton idi-loginout">Login</button>   
+            <?php endif; ?>
+        </div>
+    </div>
+    <!-- end markup for UI Options Fat Panel -->
\ No newline at end of file