fixed logout + stylized barkeeper
fixed conflicts
fixed conflicts 2