Add close button, minor frame renaming.