Tidied up overall structure and added delete btns