Adding text to creation icons and other cleanup