Code refactoring and Standardize UI Style update