minor string and layout changes