Tweaking some text and layout