Fix critical error
Add delete button and fix whitespace