Improve titles
Tweak navbar a bit