Fixes close button and updates names output format