UI changes; Edit can get checkbox values;