Added new tabs, merging master