Tweaks to make theme better