Made some layout changes and added localized messages.