Refactor UI and change BundleID