Tweak layout a bit