Cleaned up the ui equipment system