Navigation changes

except for the overlap over logout