Cleaned up the UI and added the tooltips on the org managment page
Corrected ui button bug