Tweak positioning to be more flexible