Tweaks to titles and border