Small layout changes, use messages.