delete functionality added, some layout fixed, added auto generation