CONN-1259: Improve UI Issues on Direct Screens
Merge pull request #860 from kerry-chin/CONN-1259b

CONN-1259: Improve UI Issues on Direct Screens -- NEW PR