UI Fixes to support all orientations (upside added)

UI Fixes to support all orientations (upside added)