Updated the Layout again and added delete button