Strings and Layout adjusted