Moved to Fontawesome based Icons and Added JSON and AJAX rendering