Merge pull request #121 from Useful-Innovation/davids-fixes

Fixed header, links, logout...