Follow up work on TabBar