Updated trading window

Not done yet.