Issue-277-navigation active state