Fix: Edit: Adjust order of things

Adjusting the order of things on the edit
page wasn't working, because things were
spanning two lines / overlapping and
getting confused.

Change-Id: I788f187a8fcc8a3c2120642b8dad5e281a00d59d