Some code cleanup and page title tweaks.