minor ui bug fixes
Merge remote-tracking branch 'origin/master' into American-Futures