Cleaned up interface and underlying code
Callback for rename check box
Cleaned up code