add better theme, delete button and compelet template