Fixed edit for weight list and other things