Fixed TabBar Bugs