Add logout link and clean up a bit