Added localisation. Fixed layouts