added logout buttons, minor fixes