small refactoring 4
changed RefreshState
Added aero class
fix events name