Added delete functionality, cleaned up layout a little