Various fixes (to Android compatibility, display order etc.)