Few more tabs changes

For better readability.