Some more nav tweak and front page wording