Improved trading UI logic