[1/2] Movable NavBar

Changed logic little bit

Change-Id: I90c3452fc0be4fb38b967389047901b2efdb98e8
Signed-off-by: kecinzer <kecinzer@gmail.com>