Small tweaks refered to device rotation