Changed delete buttons to generic prompt function
Formatting