removed color panel
refactoring