- adding top-bar
- fix handler bug