Added delete functionality.
Improved design.