Clean up id use.
Rearrange elements at the top.