diff --git a/RIGS/test_functional.py b/RIGS/test_functional.py
index 69615bf9..b5b967dd 100644
--- a/RIGS/test_functional.py
+++ b/RIGS/test_functional.py
@@ -6,262 +6,297 @@ from RIGS import models
 import re
 import os
 
+
 class UserRegistrationTest(LiveServerTestCase):
-	def setUp(self):
-		self.browser = webdriver.Firefox()
-		os.environ['RECAPTCHA_TESTING'] = 'True'
 
-	def tearDown(self):
-		self.browser.quit()
-		os.environ['RECAPTCHA_TESTING'] = 'False'
+    def setUp(self):
+        self.browser = webdriver.Firefox()
+        os.environ['RECAPTCHA_TESTING'] = 'True'
 
-	def test_registration(self):
-		# Navigate to the registration page
-		self.browser.get(self.live_server_url + '/user/register/')
-		#self.browser.implicitly_wait(3)
-		title_text = self.browser.find_element_by_tag_name('h3').text
-		self.assertIn("User Registration", title_text)
-		
-		# Check the form invites correctly
-		username = self.browser.find_element_by_id('id_username')
-		self.assertEqual(username.get_attribute('placeholder'), 'Username')
-		email = self.browser.find_element_by_id('id_email')
-		self.assertEqual(email.get_attribute('placeholder'), 'E-mail')
-		self.assertEqual(email.get_attribute('type'), 'email') # If this is correct we don't need to test it later
-		password1 = self.browser.find_element_by_id('id_password1')
-		self.assertEqual(password1.get_attribute('placeholder'), 'Password')
-		self.assertEqual(password1.get_attribute('type'), 'password')
-		password2 = self.browser.find_element_by_id('id_password2')
-		self.assertEqual(password2.get_attribute('placeholder'), 'Password confirmation')
-		self.assertEqual(password2.get_attribute('type'), 'password')
-		first_name = self.browser.find_element_by_id('id_first_name')
-		self.assertEqual(first_name.get_attribute('placeholder'), 'First name')
-		last_name = self.browser.find_element_by_id('id_last_name')
-		self.assertEqual(last_name.get_attribute('placeholder'), 'Last name')
-		initials = self.browser.find_element_by_id('id_initials')
-		self.assertEqual(initials.get_attribute('placeholder'), 'Initials')
-		phone = self.browser.find_element_by_id('id_phone')
-		self.assertEqual(phone.get_attribute('placeholder'), 'Phone')
-		
-		# Fill the form out incorrectly
-		username.send_keys('TestUsername')
-		email.send_keys('test@example.com')
-		password1.send_keys('correcthorsebatterystaple')
-		password2.send_keys('correcthorsebatterystapleerror') # deliberate mistake
-		first_name.send_keys('John')
-		last_name.send_keys('Smith')
-		initials.send_keys('JS')
-		phone.send_keys('0123456789')
-		self.browser.execute_script("return jQuery('#g-recaptcha-response').val('PASSED')")
+    def tearDown(self):
+        self.browser.quit()
+        os.environ['RECAPTCHA_TESTING'] = 'False'
 
-		# Submit incorrect form
-		submit = self.browser.find_element_by_xpath("//input[@type='submit']")
-		submit.click()
-		# Restablish error fields
-		password1 = self.browser.find_element_by_id('id_password1')
-		password2 = self.browser.find_element_by_id('id_password2')
+    def test_registration(self):
+        # Navigate to the registration page
+        self.browser.get(self.live_server_url + '/user/register/')
+        # self.browser.implicitly_wait(3)
+        title_text = self.browser.find_element_by_tag_name('h3').text
+        self.assertIn("User Registration", title_text)
 
-		# Read what the error is
-		alert = self.browser.find_element_by_css_selector('div.alert-danger').text
-		self.assertIn("password fields didn't match", alert)
+        # Check the form invites correctly
+        username = self.browser.find_element_by_id('id_username')
+        self.assertEqual(username.get_attribute('placeholder'), 'Username')
+        email = self.browser.find_element_by_id('id_email')
+        self.assertEqual(email.get_attribute('placeholder'), 'E-mail')
+        # If this is correct we don't need to test it later
+        self.assertEqual(email.get_attribute('type'), 'email')
+        password1 = self.browser.find_element_by_id('id_password1')
+        self.assertEqual(password1.get_attribute('placeholder'), 'Password')
+        self.assertEqual(password1.get_attribute('type'), 'password')
+        password2 = self.browser.find_element_by_id('id_password2')
+        self.assertEqual(
+            password2.get_attribute('placeholder'), 'Password confirmation')
+        self.assertEqual(password2.get_attribute('type'), 'password')
+        first_name = self.browser.find_element_by_id('id_first_name')
+        self.assertEqual(first_name.get_attribute('placeholder'), 'First name')
+        last_name = self.browser.find_element_by_id('id_last_name')
+        self.assertEqual(last_name.get_attribute('placeholder'), 'Last name')
+        initials = self.browser.find_element_by_id('id_initials')
+        self.assertEqual(initials.get_attribute('placeholder'), 'Initials')
+        phone = self.browser.find_element_by_id('id_phone')
+        self.assertEqual(phone.get_attribute('placeholder'), 'Phone')
 
-		# Passwords should be empty
-		self.assertEqual(password1.get_attribute('value'), '')
-		self.assertEqual(password2.get_attribute('value'), '')
+        # Fill the form out incorrectly
+        username.send_keys('TestUsername')
+        email.send_keys('test@example.com')
+        password1.send_keys('correcthorsebatterystaple')
+        # deliberate mistake
+        password2.send_keys('correcthorsebatterystapleerror')
+        first_name.send_keys('John')
+        last_name.send_keys('Smith')
+        initials.send_keys('JS')
+        phone.send_keys('0123456789')
+        self.browser.execute_script(
+            "return jQuery('#g-recaptcha-response').val('PASSED')")
 
-		# Correct error
-		password1.send_keys('correcthorsebatterystaple')
-		password2.send_keys('correcthorsebatterystaple')
-		self.browser.execute_script("return jQuery('#g-recaptcha-response').val('PASSED')")
+        # Submit incorrect form
+        submit = self.browser.find_element_by_xpath("//input[@type='submit']")
+        submit.click()
+        # Restablish error fields
+        password1 = self.browser.find_element_by_id('id_password1')
+        password2 = self.browser.find_element_by_id('id_password2')
 
-		# Submit again
-		password2.send_keys(Keys.ENTER)
+        # Read what the error is
+        alert = self.browser.find_element_by_css_selector(
+            'div.alert-danger').text
+        self.assertIn("password fields didn't match", alert)
 
-		# Check we have a success message
-		alert = self.browser.find_element_by_css_selector('div.alert-success').text
-		self.assertIn('register', alert)
-		self.assertIn('email', alert)
+        # Passwords should be empty
+        self.assertEqual(password1.get_attribute('value'), '')
+        self.assertEqual(password2.get_attribute('value'), '')
 
-		# Check Email
-		self.assertEqual(len(mail.outbox), 1)
-		email = mail.outbox[0]
-		self.assertIn('activation required', email.subject)
-		urls = re.findall('http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', email.message)
-		self.assertEqual(len(urls), 2)
+        # Correct error
+        password1.send_keys('correcthorsebatterystaple')
+        password2.send_keys('correcthorsebatterystaple')
+        self.browser.execute_script(
+            "return jQuery('#g-recaptcha-response').val('PASSED')")
 
-		mail.outbox = [] # empty this for later
+        # Submit again
+        password2.send_keys(Keys.ENTER)
 
-		# Follow link
-		self.browser.get(urls[1]) # go to the second link
+        # Check we have a success message
+        alert = self.browser.find_element_by_css_selector(
+            'div.alert-success').text
+        self.assertIn('register', alert)
+        self.assertIn('email', alert)
 
-		# Complete registration
-		title_text = self.browser.find_element_by_tag_name('h2')
-		self.assertIn('Complete', title_text)
+        # Check Email
+        self.assertEqual(len(mail.outbox), 1)
+        email = mail.outbox[0]
+        self.assertIn('activation required', email.subject)
+        urls = re.findall(
+            'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', email.message)
+        self.assertEqual(len(urls), 2)
 
-		# Test login
-		self.browser.get(self.live_server_url + '/user/login')
-		username = self.browser.find_element_by_id('id_username')
-		self.assertEqual(username.get_attribute('placeholder'), 'Username')
-		password = self.browser.find_element_by_id('id_password')
-		self.assertEqual(password.get_attribute('placeholder'), 'Password')
-		self.assertEqual(password.get_attribute('type'), 'password')
+        mail.outbox = []  # empty this for later
 
-		username.send_keys('TestUsername')
-		password.send_keys('correcthorsebatterystaple')
-		password.send_keys(Keys.ENTER)
-		self.browser.execute_script("return jQuery('#g-recaptcha-response').val('PASSED')")
+        # Follow link
+        self.browser.get(urls[1])  # go to the second link
 
-		# Check we are logged in
-		udd = self.browser.find_element_by_id('userdropdown')
-		self.assertIn('Hi John', udd)
+        # Complete registration
+        title_text = self.browser.find_element_by_tag_name('h2')
+        self.assertIn('Complete', title_text)
+
+        # Test login
+        self.browser.get(self.live_server_url + '/user/login')
+        username = self.browser.find_element_by_id('id_username')
+        self.assertEqual(username.get_attribute('placeholder'), 'Username')
+        password = self.browser.find_element_by_id('id_password')
+        self.assertEqual(password.get_attribute('placeholder'), 'Password')
+        self.assertEqual(password.get_attribute('type'), 'password')
+
+        username.send_keys('TestUsername')
+        password.send_keys('correcthorsebatterystaple')
+        password.send_keys(Keys.ENTER)
+        self.browser.execute_script(
+            "return jQuery('#g-recaptcha-response').val('PASSED')")
+
+        # Check we are logged in
+        udd = self.browser.find_element_by_id('userdropdown')
+        self.assertIn('Hi John', udd)
+
+        # All is well
 
-		# All is well
 
 class EventTest(LiveServerTestCase):
-	def setUp(self):
-		self.profile = models.Profile(username="EventTest", first_name="Event", last_name="Test", initials="ETU", is_superuser=True)
-		self.profile.set_password("EventTestPassword")
-		self.profile.save()
 
-		self.browser = webdriver.Firefox()
-		os.environ['RECAPTCHA_TESTING'] = 'True'
+    def setUp(self):
+        self.profile = models.Profile(
+            username="EventTest", first_name="Event", last_name="Test", initials="ETU", is_superuser=True)
+        self.profile.set_password("EventTestPassword")
+        self.profile.save()
 
-	def tearDown(self):
-		self.browser.quit()
-		os.environ['RECAPTCHA_TESTING'] = 'False'
+        self.browser = webdriver.Firefox()
+        os.environ['RECAPTCHA_TESTING'] = 'True'
 
-	def authenticate(self, n=None):
-		self.assertIn(self.live_server_url + '/user/login/', self.browser.current_url)
-		if n:
-			self.assertIn('?next=%s'%n, self.browser.current_url)
-		username = self.browser.find_element_by_id('id_username')
-		password = self.browser.find_element_by_id('id_password')
-		submit = self.browser.find_element_by_css_selector('input[type=submit]')
+    def tearDown(self):
+        self.browser.quit()
+        os.environ['RECAPTCHA_TESTING'] = 'False'
 
-		username.send_keys("EventTest")
-		password.send_keys("EventTestPassword")
-		self.browser.execute_script("return jQuery('#g-recaptcha-response').val('PASSED')")
-		submit.click()
+    def authenticate(self, n=None):
+        self.assertIn(
+            self.live_server_url + '/user/login/', self.browser.current_url)
+        if n:
+            self.assertIn('?next=%s' % n, self.browser.current_url)
+        username = self.browser.find_element_by_id('id_username')
+        password = self.browser.find_element_by_id('id_password')
+        submit = self.browser.find_element_by_css_selector(
+            'input[type=submit]')
 
-		self.assertEqual(self.live_server_url + n, self.browser.current_url)
+        username.send_keys("EventTest")
+        password.send_keys("EventTestPassword")
+        self.browser.execute_script(
+            "return jQuery('#g-recaptcha-response').val('PASSED')")
+        submit.click()
 
-	def testRigboardButtons(self):
-		# Requests address
-		self.browser.get(self.live_server_url + '/rigboard/')
-		# Gets redirected to login
-		self.authenticate('/rigboard/')
+        self.assertEqual(self.live_server_url + n, self.browser.current_url)
 
-		# Completes and comes back to rigboard
-		# Clicks add new
-		self.browser.find_element_by_partial_link_text("New").click()
-		self.assertEqual(self.live_server_url + '/event/create/', self.browser.current_url)
-		self.browser.get(self.live_server_url + '/rigboard/')
+    def testRigboardButtons(self):
+        # Requests address
+        self.browser.get(self.live_server_url + '/rigboard/')
+        # Gets redirected to login
+        self.authenticate('/rigboard/')
 
-	def testRigCreate(self):
-		# Requests address
-		self.browser.get(self.live_server_url + '/event/create/')
-		# Gets redirected to login and back
-		self.authenticate('/event/create/')
+        # Completes and comes back to rigboard
+        # Clicks add new
+        self.browser.find_element_by_partial_link_text("New").click()
+        self.assertEqual(
+            self.live_server_url + '/event/create/', self.browser.current_url)
+        self.browser.get(self.live_server_url + '/rigboard/')
 
-		# Check has slided up correctly - third save button hidden
-		save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
-		self.assertFalse(save.is_displayed())
+    def testRigCreate(self):
+        # Requests address
+        self.browser.get(self.live_server_url + '/event/create/')
+        # Gets redirected to login and back
+        self.authenticate('/event/create/')
 
-		# Click Rig button
-		self.browser.find_element_by_xpath('//button[.="Rig"]').click()
+        # Check has slided up correctly - third save button hidden
+        save = self.browser.find_element_by_xpath(
+            '(//button[@type="submit"])[3]')
+        self.assertFalse(save.is_displayed())
 
-		# Slider expands and save button visible
-		self.assertTrue(save.is_displayed())
-		form = self.browser.find_element_by_tag_name('form')
+        # Click Rig button
+        self.browser.find_element_by_xpath('//button[.="Rig"]').click()
 
-		# Create new person
-		add_person_button = self.browser.find_element_by_xpath('//a[@data-target="#id_person" and contains(@href, "add")]')
-		add_person_button.click()
+        # Slider expands and save button visible
+        self.assertTrue(save.is_displayed())
+        form = self.browser.find_element_by_tag_name('form')
 
-		# See modal has opened
-		modal = self.browser.find_element_by_id('modal')
-		self.browser.implicitly_wait(3)
-		self.assertTrue(modal.is_displayed())
-		self.assertIn("Add Person", modal.find_element_by_tag_name('h3').text)
+        # Create new person
+        add_person_button = self.browser.find_element_by_xpath(
+            '//a[@data-target="#id_person" and contains(@href, "add")]')
+        add_person_button.click()
 
-		# Fill person form out and submit
-		modal.find_element_by_xpath('//div[@id="modal"]//input[@id="id_name"]').send_keys("Test Person 1")
-		modal.find_element_by_xpath('//div[@id="modal"]//input[@type="submit"]').click()
-		self.browser.implicitly_wait(3)
-		self.assertFalse(modal.is_displayed())
+        # See modal has opened
+        modal = self.browser.find_element_by_id('modal')
+        self.browser.implicitly_wait(3)
+        self.assertTrue(modal.is_displayed())
+        self.assertIn("Add Person", modal.find_element_by_tag_name('h3').text)
 
-		# See new person selected
-		person1 = models.Person.objects.get(name="Test Person 1")
-		self.assertEqual(person1.name, form.find_element_by_xpath('//button[@data-id="id_person"]/span').text)
-		# and backend
-		option = form.find_element_by_xpath('//select[@id="id_person"]//option[@selected="selected"]')
-		self.assertEqual(person1.pk, int(option.get_attribute("value")))
+        # Fill person form out and submit
+        modal.find_element_by_xpath(
+            '//div[@id="modal"]//input[@id="id_name"]').send_keys("Test Person 1")
+        modal.find_element_by_xpath(
+            '//div[@id="modal"]//input[@type="submit"]').click()
+        self.browser.implicitly_wait(3)
+        self.assertFalse(modal.is_displayed())
 
-		# Change mind and add another
-		add_person_button.click()
+        # See new person selected
+        person1 = models.Person.objects.get(name="Test Person 1")
+        self.assertEqual(person1.name, form.find_element_by_xpath(
+            '//button[@data-id="id_person"]/span').text)
+        # and backend
+        option = form.find_element_by_xpath(
+            '//select[@id="id_person"]//option[@selected="selected"]')
+        self.assertEqual(person1.pk, int(option.get_attribute("value")))
 
-		self.browser.implicitly_wait(3)
-		self.assertTrue(modal.is_displayed())
-		self.assertIn("Add Person", modal.find_element_by_tag_name('h3').text)
+        # Change mind and add another
+        add_person_button.click()
 
-		modal.find_element_by_xpath('//div[@id="modal"]//input[@id="id_name"]').send_keys("Test Person 2")
-		modal.find_element_by_xpath('//div[@id="modal"]//input[@type="submit"]').click()
-		self.browser.implicitly_wait(3)
-		self.assertFalse(modal.is_displayed())
+        self.browser.implicitly_wait(3)
+        self.assertTrue(modal.is_displayed())
+        self.assertIn("Add Person", modal.find_element_by_tag_name('h3').text)
 
-		person2 = models.Person.objects.get(name="Test Person 2")
-		self.assertEqual(person2.name, form.find_element_by_xpath('//button[@data-id="id_person"]/span').text)
-		# Have to do this explcitly to force the wait for it to update
-		option = form.find_element_by_xpath('//select[@id="id_person"]//option[@selected="selected"]')
-		self.assertEqual(person2.pk, int(option.get_attribute("value")))
+        modal.find_element_by_xpath(
+            '//div[@id="modal"]//input[@id="id_name"]').send_keys("Test Person 2")
+        modal.find_element_by_xpath(
+            '//div[@id="modal"]//input[@type="submit"]').click()
+        self.browser.implicitly_wait(3)
+        self.assertFalse(modal.is_displayed())
 
-		# Was right the first time, change it back
-		person_select = form.find_element_by_xpath('//button[@data-id="id_person"]')
-		person_select.send_keys(person1.name)
-		person_dropped = form.find_element_by_xpath('//ul[contains(@class, "inner selectpicker")]//span[contains(text(), "%s")]'%person1.name)
-		person_dropped.click()
+        person2 = models.Person.objects.get(name="Test Person 2")
+        self.assertEqual(person2.name, form.find_element_by_xpath(
+            '//button[@data-id="id_person"]/span').text)
+        # Have to do this explcitly to force the wait for it to update
+        option = form.find_element_by_xpath(
+            '//select[@id="id_person"]//option[@selected="selected"]')
+        self.assertEqual(person2.pk, int(option.get_attribute("value")))
 
-		self.assertEqual(person1.name, form.find_element_by_xpath('//button[@data-id="id_person"]/span').text)
-		option = form.find_element_by_xpath('//select[@id="id_person"]//option[@selected="selected"]')
-		self.assertEqual(person1.pk, int(option.get_attribute("value")))
+        # Was right the first time, change it back
+        person_select = form.find_element_by_xpath(
+            '//button[@data-id="id_person"]')
+        person_select.send_keys(person1.name)
+        person_dropped = form.find_element_by_xpath(
+            '//ul[contains(@class, "inner selectpicker")]//span[contains(text(), "%s")]' % person1.name)
+        person_dropped.click()
 
-		# Edit Person 1 to have a better name
-		form.find_element_by_xpath('//a[@data-target="#id_person" and contains(@href, "%s/edit/")]'%person1.pk).click()
-		self.browser.implicitly_wait(3)
-		self.assertTrue(modal.is_displayed())
-		self.assertIn("Edit Person", modal.find_element_by_tag_name('h3').text)
-		name = modal.find_element_by_xpath('//div[@id="modal"]//input[@id="id_name"]')
-		self.assertEqual(person1.name, name.get_attribute('value'))
-		name.clear()
-		name.send_keys('Rig ' + person1.name)
-		name.send_keys(Keys.ENTER)
-		self.browser.implicitly_wait(3)
-		self.assertFalse(modal.is_displayed())
-		person1 = models.Person.objects.get(pk=person1.pk)
-		self.assertEqual(person1.name, form.find_element_by_xpath('//button[@data-id="id_person"]/span').text)
+        self.assertEqual(person1.name, form.find_element_by_xpath(
+            '//button[@data-id="id_person"]/span').text)
+        option = form.find_element_by_xpath(
+            '//select[@id="id_person"]//option[@selected="selected"]')
+        self.assertEqual(person1.pk, int(option.get_attribute("value")))
 
-		# Create organisation
+        # Edit Person 1 to have a better name
+        form.find_element_by_xpath(
+            '//a[@data-target="#id_person" and contains(@href, "%s/edit/")]' % person1.pk).click()
+        self.browser.implicitly_wait(3)
+        self.assertTrue(modal.is_displayed())
+        self.assertIn("Edit Person", modal.find_element_by_tag_name('h3').text)
+        name = modal.find_element_by_xpath(
+            '//div[@id="modal"]//input[@id="id_name"]')
+        self.assertEqual(person1.name, name.get_attribute('value'))
+        name.clear()
+        name.send_keys('Rig ' + person1.name)
+        name.send_keys(Keys.ENTER)
+        self.browser.implicitly_wait(3)
+        self.assertFalse(modal.is_displayed())
+        person1 = models.Person.objects.get(pk=person1.pk)
+        self.assertEqual(person1.name, form.find_element_by_xpath(
+            '//button[@data-id="id_person"]/span').text)
 
-		# See it is selected
+        # Create organisation
 
-		# Create veneue
+        # See it is selected
 
-		# See it selected
+        # Create veneue
 
-		# Set start date/time
+        # See it selected
 
-		# Set end date/time
+        # Set start date/time
 
-		# Add item
+        # Set end date/time
 
-		# See new item appear
+        # Add item
 
-		# Attempt to save - missing title
+        # See new item appear
 
-		# See error and all data preserved
+        # Attempt to save - missing title
 
-		# Set title
+        # See error and all data preserved
 
-		# Save again
+        # Set title
 
-		# See redirected to success page
+        # Save again
+
+        # See redirected to success page