Moving navigation to hashtag, and numerous corrections