Moving logout to includes