Made more on handling device orientation