Get rid of the nested tabs, and give the existing tabs better names...