Move #entry_skip back to a seperate form element.

References #159