fix list for choose localisation
fix setting layout
Merge remote-tracking branch 'origin/master'