Fixed some session bugs
Fixed layout issue