merge
fix separators in nav bar
next merge