Proper page title handling, more cleanup