Screen orientation issues fixed