Fixing few minor issues with TabBar