Edit matches show view

Address issue #57.  The edit flow matches the order in Issue #79.

Fix some of the formatting so the select boxes match up
with the inline text.