gui/navbar
gui/navbar
merge nghialv branch with fukuda branch