Changes for Android tablet