working firebase, navigation improvement