Small UI changes in order to giive focus to the right tabs