re-organize nav
add some transitions