Add tabs and tweak