Move all the auth fields into a shared partial.

Move the Merge action in the toolbar to float right.