Replaced TabBar with a simple toolbar
Added toolbar and put the right bundle ID and icons in place