2 level navbar & refactor news