Added selection to tabs and settings tab