added logout to nav; added get currency all ;cleand up a bit