core refactoring.
more hansome ui