changes to tabs and buttons
merged master