Polishing controls

Trading doesn't work, I don't know what to do about it. It's probably a UI thing since the tests still pass.