Updated text and a bit of layout