Moved to AJAX loading scheme
 - great performance improvement