Fixed formatting
Merge branch 'TabFunctionality'