Fixed logout, added decorators