New UI: TabBar; Some code re-formatting