Clean up admin settings layout
Fix merge conflict