Fix navbar & start adding links