use headers instead of using nav-bar
use header-bar, fix indentations