Added AJAX and some UI improvements