Second pass at responsifying admin.
merge conflict.