update navigation activity
update navigation activity setContentView method
update navigation activity navigation bar
merge with ares