Little changes in input-type etc, and menu (maps)