Added toolbar and put the right bundle ID and icons in place