Refactored to use the latest admin, toolkit and font awesome