[upd] refactoring and visual changed