Adjust layout, text tweaks