Fixed bug of list not updating properly
Added fieldset with legend to improve usability