diff --git a/Engine/source/gui/buttons/guiBitmapButtonCtrl.cpp b/Engine/source/gui/buttons/guiBitmapButtonCtrl.cpp
index f2ee24d43..46e4e69c1 100644
--- a/Engine/source/gui/buttons/guiBitmapButtonCtrl.cpp
+++ b/Engine/source/gui/buttons/guiBitmapButtonCtrl.cpp
@@ -669,4 +669,10 @@ bool GuiBitmapButtonCtrl::pointInControl(const Point2I& parentCoordPoint)
       return Parent::pointInControl(parentCoordPoint);
 }
 
-DEF_ASSET_BINDS_REFACTOR(GuiBitmapButtonCtrl, Bitmap)
+DefineEngineMethod(GuiBitmapButtonCtrl, getBitmap, StringTableEntry, (), , "get name") {
+   return object->getBitmapFile();
+}DefineEngineMethod(GuiBitmapButtonCtrl, getBitmapAsset, StringTableEntry, (), , assetText(Bitmap, asset reference)) {
+   return object->_getBitmap();
+}DefineEngineMethod(GuiBitmapButtonCtrl, setBitmap, void, (const char* assetName), , assetText(Bitmap, assignment.first tries asset then flat file.)) {
+   object->setBitmap(StringTable->insert(assetName));
+}
diff --git a/Engine/source/gui/buttons/guiIconButtonCtrl.cpp b/Engine/source/gui/buttons/guiIconButtonCtrl.cpp
index 813a3a2e2..9c0cd7517 100644
--- a/Engine/source/gui/buttons/guiIconButtonCtrl.cpp
+++ b/Engine/source/gui/buttons/guiIconButtonCtrl.cpp
@@ -464,4 +464,10 @@ void GuiIconButtonCtrl::renderBitmapArray(RectI &bounds, S32 state)
    }
 }
 
-DEF_ASSET_BINDS_REFACTOR(GuiIconButtonCtrl, Bitmap)
+DefineEngineMethod(GuiIconButtonCtrl, getBitmap, StringTableEntry, (), , "get name") {
+   return object->getBitmapFile();
+}DefineEngineMethod(GuiIconButtonCtrl, getBitmapAsset, StringTableEntry, (), , assetText(Bitmap, asset reference)) {
+   return object->_getBitmap();
+}DefineEngineMethod(GuiIconButtonCtrl, setBitmap, void, (const char* assetName), , assetText(Bitmap, assignment.first tries asset then flat file.)) {
+   object->setBitmap(StringTable->insert(assetName));
+}
diff --git a/Templates/BaseGame/game/data/DamageModel/DamageModel.module b/Templates/BaseGame/game/data/DamageModel/DamageModel.module
index 0bce1ed70..26de8f0dc 100644
--- a/Templates/BaseGame/game/data/DamageModel/DamageModel.module
+++ b/Templates/BaseGame/game/data/DamageModel/DamageModel.module
@@ -4,7 +4,9 @@
     Group="Game"
     scriptFile="DamageModel.tscript"
     CreateFunction="onCreate"
-    DestroyFunction="onDestroy">
+    DestroyFunction="onDestroy"
+	Group="Game"
+    Dependencies="UI=1">
     <DeclaredAssets
         Extension="asset.taml"
         Recurse="true"/>
diff --git a/Templates/BaseGame/game/data/DamageModel/guis/damageGuiOverlay.gui b/Templates/BaseGame/game/data/DamageModel/guis/damageGuiOverlay.gui
index f8c78c3aa..52832bb3b 100644
--- a/Templates/BaseGame/game/data/DamageModel/guis/damageGuiOverlay.gui
+++ b/Templates/BaseGame/game/data/DamageModel/guis/damageGuiOverlay.gui
@@ -4,7 +4,7 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
    minExtent = "8 8";
    horizSizing = "relative";
    vertSizing = "relative";
-   profile = "GuiDefaultProfile";
+   profile = "GuiModelessDialogProfile";
    tooltipProfile = "GuiToolTipProfile";
    canSaveDynamicFields = "1";
       enabled = "1";
@@ -25,7 +25,6 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
    };
    new GuiCrossHairHud(Reticle) {
       damageOffset = "0 10";
-      BitmapAsset = "";
       position = "624 344";
       extent = "32 32";
       minExtent = "8 8";
@@ -64,6 +63,7 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
       };
       new GuiBitmapCtrl(previewImage) {
          BitmapAsset = "UI:hudfill_image";
+         BitmapFile = "data/UI/images/hudfill.png";
          position = "8 0";
          extent = "108 56";
          horizSizing = "width";
@@ -80,7 +80,7 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
          extent = "120 16";
          minExtent = "8 8";
          vertSizing = "top";
-         profile = "HudTextItalicProfile";
+         profile = "GuiModelessDialogProfile";
          tooltipProfile = "GuiToolTipProfile";
          isContainer = "0";
       };
@@ -95,7 +95,7 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
       position = "5 645";
       extent = "72 72";
       vertSizing = "top";
-      profile = "GuiBigTextProfile";
+      profile = "GuiModelessDialogProfile";
       tooltipProfile = "GuiToolTipProfile";
    };
    new GuiControl(DamageHUD) {
diff --git a/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript b/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript
index 3d6be85a6..f502982ad 100644
--- a/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript
+++ b/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript
@@ -1036,7 +1036,7 @@ function OptionsMenu::populateKeybinds(%this,%device, %controlsList) {
    if($activeRemapControlSet $= "")
       $activeRemapControlSet = getField(%actionMapList, 0);
 
-   echo("============================================");
+   //echo("============================================");
 
    for(%am = 0; %am < getFieldCount(%actionMapList); %am++)
    {
@@ -1064,7 +1064,7 @@ function OptionsMenu::populateKeybinds(%this,%device, %controlsList) {
          %keyMap = buildFullMapString( %i, $RemapActionMap[%i], %device );
          %description = $RemapDescription[%i];
 
-         echo("Added ActionMap Entry: " @ %actionMapName @ " | " @ %device @ " | " @ %keymap @ " | " @ %description);
+         //echo("Added ActionMap Entry: " @ %actionMapName @ " | " @ %device @ " | " @ %keymap @ " | " @ %description);
 
          %remapEntry = addActionMapEntry(%actionMapName, %device, %keyMap, %i, %description);
          %controlsList.add(%remapEntry);
@@ -1245,7 +1245,7 @@ function addActionMapEntry(%actionMap, %device, %keyMap, %index, %description)
    };
 
    %buttonContainer = %entry.findObjectByInternalName("valuesContainer");
-   echo("Keymap: " @ %keymap @ " | Keymap word count: " @ getWordCount(getField(%keyMap, 1)));
+   //echo("Keymap: " @ %keymap @ " | Keymap word count: " @ getWordCount(getField(%keyMap, 1)));
    if(getWordCount(getField(%keyMap, 1)) == 2)
    {
       %modifierBtn = new GuiIconButtonCtrl() {