More design and text changes