Tweak layout and use counter.