More improvements for Android (navigation working)