Fixing the tab content (left/right) to ensure the content is correct.
Merge remote-tracking branch 'origin/master'