Tweaks to overall app