Tweak spacing and add persistent title