refactoring 3, toolbar, graphic enhancement