Added short message and
autofocus to form.  Cleaned up layout.