Clean up + add button to admin bar