better layout
event emitting moved to Session