Continuing to tweak for spacing