More polish changes, and changed the default initiative mugshot
fixed applicationhelper merge conflict