Added Entities tags in *.nugroups.
Added better error-handling for screen changes.