More cleanup and Tweaks

Page title themed.
More code cleanup.