Fixed logout link; Remove email editing. Closes #696, closes #697