Change titles and headers to look better (hopefully)