tune layout and some wording