github merge
login navigation fixes