Minor layout and text changes