Add top nav bar and improve semantic markup