More styling changes

Updates to minor styling and more accepted file types in the uploader.
Small fix.
Merge commit 'c39d4d6d7aa69ddb6ba64fe4cddf2ea30559c2b2'

* commit 'c39d4d6d7aa69ddb6ba64fe4cddf2ea30559c2b2':
  Small fix.
  More styling changes

Conflicts:
	_includes/ssi/footer.php