Logic part refactoring
Display structure part refactoring