Varies updates. Mainly fix the list adding bug in grid view for multiple resources.
Manuelly merge the comits.