Added pop up box for delete and minor changes - Yunnie