Tweak the design some more