Refactored how titles are displayed on all pages