Added MODAL and AJAX feature