Admin polish.
Button sizes adjusted
Button sizes adjusted
Button sizes adjusted
Merge branch 'ui-polish'
minor UI changes for conflicts screen