Change in package name and uniform Ui