Refactoring the Code, Adding the CN strings, adjust the Layout.