Fix ID generation for new containers
Update main activity on resume
Fix name for new container