Added new tabs and moved things around