fixed few nav issues