UI ver. 1.2.1

Code Refactoring