From 3cb360361dd9953a506d3b9d672144ed894a9282 Mon Sep 17 00:00:00 2001
From: Bill <billsonnn@live.com>
Date: Wed, 30 Jun 2021 00:32:39 -0400
Subject: [PATCH] Update actions

---
 .../wired/common/GetWiredActionLayout.tsx     |  2 +
 .../actions/base/WiredActionBaseView.tsx      | 16 ++--
 .../WiredActionBotFollowAvatarView.tsx        | 24 +++---
 .../WiredActionBotGiveHandItemView.tsx        | 24 +++---
 .../WiredActionBotTalkToAvatarView.tsx        | 22 +++---
 .../bot-talk/WiredActionBotTalkView.tsx       | 22 +++---
 .../WiredActionCallAnotherStackView.tsx       |  4 +-
 .../actions/chase/WiredActionChaseView.tsx    |  4 +-
 .../actions/flee/WiredActionFleeView.tsx      |  4 +-
 ...redActionGiveScoreToPredefinedTeamView.tsx | 72 +++++++++--------
 .../give-score/WiredActionGiveScoreView.tsx   | 42 +++++-----
 .../join-team/WiredActionJoinTeamView.tsx     | 28 +++----
 .../leave-team/WiredActionLeaveTeamView.tsx   |  4 +-
 .../WiredActionMoveAndRotateFurniView.tsx     | 50 +++++++-----
 .../WiredActionMoveFurniToView.tsx            | 57 +++++++-------
 .../move-furni/WiredActionMoveFurniView.tsx   | 78 ++++++++++---------
 .../mute-user/WiredActionMuteUserView.tsx     | 21 +++--
 .../actions/reset/WiredActionResetView.tsx    |  4 +-
 .../WiredActionSetFurniStateToView.tsx        | 42 +++++-----
 .../teleport/WiredActionTeleportView.tsx      |  4 +-
 .../WiredActionToggleFurniStateView.tsx       |  4 +-
 21 files changed, 272 insertions(+), 256 deletions(-)

diff --git a/src/views/wired/common/GetWiredActionLayout.tsx b/src/views/wired/common/GetWiredActionLayout.tsx
index fe1ca34f..912288c2 100644
--- a/src/views/wired/common/GetWiredActionLayout.tsx
+++ b/src/views/wired/common/GetWiredActionLayout.tsx
@@ -77,4 +77,6 @@ export function GetWiredActionLayout(code: number): JSX.Element
         case WiredActionLayout.TOGGLE_FURNI_STATE:
             return <WiredActionToggleFurniStateView />;
     }
+
+    return null;
 }
diff --git a/src/views/wired/views/actions/base/WiredActionBaseView.tsx b/src/views/wired/views/actions/base/WiredActionBaseView.tsx
index 758a2bf2..c88c3b00 100644
--- a/src/views/wired/views/actions/base/WiredActionBaseView.tsx
+++ b/src/views/wired/views/actions/base/WiredActionBaseView.tsx
@@ -32,14 +32,14 @@ export const WiredActionBaseView: FC<WiredActionBaseViewProps> = props =>
                 { children }
                 <hr className="my-1 mb-2 bg-dark" />
             </> }
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.delay', [ 'seconds' ], [ GetWiredTimeLocale(delay) ]) }</div>
-            <Slider 
-                defaultValue={ delay }
-                dots={ true }
-                min={ 0 }
-                max={ 20 }
-                onChange={ event => setDelay(event) }
-                />
+            <div className="form-group">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.delay', [ 'seconds' ], [ GetWiredTimeLocale(delay) ]) }</label>
+                <Slider 
+                    value={ delay }
+                    min={ 0 }
+                    max={ 20 }
+                    onChange={ event => setDelay(event) } />
+            </div>
         </WiredBaseView>
     );
 }
diff --git a/src/views/wired/views/actions/bot-follow-avatar/WiredActionBotFollowAvatarView.tsx b/src/views/wired/views/actions/bot-follow-avatar/WiredActionBotFollowAvatarView.tsx
index 2f0b4abf..ae38d8a6 100644
--- a/src/views/wired/views/actions/bot-follow-avatar/WiredActionBotFollowAvatarView.tsx
+++ b/src/views/wired/views/actions/bot-follow-avatar/WiredActionBotFollowAvatarView.tsx
@@ -28,17 +28,19 @@ export const WiredActionBotFollowAvatarView: FC<{}> = props =>
                 <label className="fw-bold">{ LocalizeText('wiredfurni.params.bot.name') }</label>
                 <input type="text" className="form-control form-control-sm" maxLength={ 32 } value={ botName } onChange={ event => setBotName(event.target.value) } />
             </div>
-            <div className="form-check">
-                <input className="form-check-input" type="radio" name="followMode" id="followMode1" checked={ followMode === 1 } onChange={() => setFollowMode(1)} />
-                <label className="form-check-label" htmlFor="followMode1">
-                    { LocalizeText('wiredfurni.params.start.following') }
-                </label>
-            </div>
-            <div className="form-check">
-                <input className="form-check-input" type="radio" name="followMode" id="followMode2" checked={ followMode === 0 } onChange={() => setFollowMode(0)} />
-                <label className="form-check-label" htmlFor="followMode2">
-                    { LocalizeText('wiredfurni.params.stop.following') }
-                </label>
+            <div className="form-group">
+                <div className="form-check">
+                    <input className="form-check-input" type="radio" name="followMode" id="followMode1" checked={ (followMode === 1) } onChange={ event => setFollowMode(1) } />
+                    <label className="form-check-label" htmlFor="followMode1">
+                        { LocalizeText('wiredfurni.params.start.following') }
+                    </label>
+                </div>
+                <div className="form-check">
+                    <input className="form-check-input" type="radio" name="followMode" id="followMode2" checked={ (followMode === 0) } onChange={ event => setFollowMode(0) } />
+                    <label className="form-check-label" htmlFor="followMode2">
+                        { LocalizeText('wiredfurni.params.stop.following') }
+                    </label>
+                </div>
             </div>
         </WiredActionBaseView>
     );
diff --git a/src/views/wired/views/actions/bot-give-hand-item/WiredActionBotGiveHandItemView.tsx b/src/views/wired/views/actions/bot-give-hand-item/WiredActionBotGiveHandItemView.tsx
index 75c0db17..bb787036 100644
--- a/src/views/wired/views/actions/bot-give-hand-item/WiredActionBotGiveHandItemView.tsx
+++ b/src/views/wired/views/actions/bot-give-hand-item/WiredActionBotGiveHandItemView.tsx
@@ -4,10 +4,10 @@ import { useWiredContext } from '../../../context/WiredContext';
 import { WiredFurniType } from '../../../WiredView.types';
 import { WiredActionBaseView } from '../base/WiredActionBaseView';
 
+const allowedHanditemIds: number[] = [2, 5, 7, 8, 9, 10, 27];
+
 export const WiredActionBotGiveHandItemView: FC<{}> = props =>
 {
-    const allowedHanditemIds: number[] = [2, 5, 7, 8, 9, 10, 27];
-
     const [ botName, setBotName ] = useState('');
     const [ handItemId, setHandItemId ] = useState(-1);
     const { trigger = null, setStringParam = null, setIntParams = null } = useWiredContext();
@@ -21,7 +21,7 @@ export const WiredActionBotGiveHandItemView: FC<{}> = props =>
     const save = useCallback(() =>
     {
         setStringParam(botName);
-        setIntParams([handItemId]);
+        setIntParams([ handItemId ]);
     }, [ handItemId, botName, setStringParam, setIntParams ]);
 
     return (
@@ -30,14 +30,16 @@ export const WiredActionBotGiveHandItemView: FC<{}> = props =>
                 <label className="fw-bold">{ LocalizeText('wiredfurni.params.bot.name') }</label>
                 <input type="text" className="form-control form-control-sm" maxLength={ 32 } value={ botName } onChange={ event => setBotName(event.target.value) } />
             </div>
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.handitem') }</div>
-            <select className="form-select" value={ handItemId } onChange={ (e) => setHandItemId(Number(e.target.value)) }>
-                <option value="0">------</option>
-                {allowedHanditemIds && allowedHanditemIds.map(value =>
-                    {
-                        return <option value={ value }>{ LocalizeText('handitem' + value) }</option>
-                    })}
-            </select>
+            <div className="form-group">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.handitem') }</label>
+                <select className="form-select form-select-sm" value={ handItemId } onChange={ event => setHandItemId(parseInt(event.target.value)) }>
+                    <option value="0">------</option>
+                    { allowedHanditemIds.map(value =>
+                        {
+                            return <option key={ value } value={ value }>{ LocalizeText(`handitem${ value }`) }</option>
+                        }) }
+                </select>
+            </div>
         </WiredActionBaseView>
     );
 }
diff --git a/src/views/wired/views/actions/bot-talk-to-avatar/WiredActionBotTalkToAvatarView.tsx b/src/views/wired/views/actions/bot-talk-to-avatar/WiredActionBotTalkToAvatarView.tsx
index 27a7df7c..bbe30016 100644
--- a/src/views/wired/views/actions/bot-talk-to-avatar/WiredActionBotTalkToAvatarView.tsx
+++ b/src/views/wired/views/actions/bot-talk-to-avatar/WiredActionBotTalkToAvatarView.tsx
@@ -24,7 +24,7 @@ export const WiredActionBotTalkToAvatarView: FC<{}> = props =>
     const save = useCallback(() =>
     {
         setStringParam(botName + WIRED_STRING_DELIMETER + message);
-        setIntParams([talkMode]);
+        setIntParams([ talkMode ]);
     }, [ botName, message, talkMode, setStringParam, setIntParams ]);
 
     return (
@@ -37,17 +37,15 @@ export const WiredActionBotTalkToAvatarView: FC<{}> = props =>
                 <label className="fw-bold">{ LocalizeText('wiredfurni.params.message') }</label>
                 <input type="text" className="form-control form-control-sm" maxLength={ 64 } value={ message } onChange={ event => setMessage(event.target.value) } />
             </div>
-            <div className="form-check">
-                <input className="form-check-input" type="radio" name="talkMode" id="talkMode1" checked={ talkMode === 0 } onChange={() => setTalkMode(0)} />
-                <label className="form-check-label" htmlFor="talkMode1">
-                    { LocalizeText('wiredfurni.params.talk') }
-                </label>
-            </div>
-            <div className="form-check">
-                <input className="form-check-input" type="radio" name="talkMode" id="talkMode2" checked={ talkMode === 1 } onChange={() => setTalkMode(1)} />
-                <label className="form-check-label" htmlFor="talkMode2">
-                    { LocalizeText('wiredfurni.params.whisper') }
-                </label>
+            <div className="form-group">
+                <div className="form-check">
+                    <input className="form-check-input" type="radio" name="talkMode" id="talkMode1" checked={ (talkMode === 0) } onChange={ event => setTalkMode(0) } />
+                    <label className="form-check-label" htmlFor="talkMode1">{ LocalizeText('wiredfurni.params.talk') }</label>
+                </div>
+                <div className="form-check">
+                    <input className="form-check-input" type="radio" name="talkMode" id="talkMode2" checked={ (talkMode === 1) } onChange={ event => setTalkMode(1) } />
+                    <label className="form-check-label" htmlFor="talkMode2">{ LocalizeText('wiredfurni.params.whisper') }</label>
+                </div>
             </div>
         </WiredActionBaseView>
     );
diff --git a/src/views/wired/views/actions/bot-talk/WiredActionBotTalkView.tsx b/src/views/wired/views/actions/bot-talk/WiredActionBotTalkView.tsx
index ae7dbe69..a8b848b4 100644
--- a/src/views/wired/views/actions/bot-talk/WiredActionBotTalkView.tsx
+++ b/src/views/wired/views/actions/bot-talk/WiredActionBotTalkView.tsx
@@ -24,7 +24,7 @@ export const WiredActionBotTalkView: FC<{}> = props =>
     const save = useCallback(() =>
     {
         setStringParam(botName + WIRED_STRING_DELIMETER + message);
-        setIntParams([talkMode]);
+        setIntParams([ talkMode ]);
     }, [ botName, message, talkMode, setStringParam, setIntParams ]);
 
     return (
@@ -37,17 +37,15 @@ export const WiredActionBotTalkView: FC<{}> = props =>
                 <label className="fw-bold">{ LocalizeText('wiredfurni.params.message') }</label>
                 <input type="text" className="form-control form-control-sm" maxLength={ 64 } value={ message } onChange={ event => setMessage(event.target.value) } />
             </div>
-            <div className="form-check">
-                <input className="form-check-input" type="radio" name="talkMode" id="talkMode1" checked={ talkMode === 0 } onChange={() => setTalkMode(0)} />
-                <label className="form-check-label" htmlFor="talkMode1">
-                    { LocalizeText('wiredfurni.params.talk') }
-                </label>
-            </div>
-            <div className="form-check">
-                <input className="form-check-input" type="radio" name="talkMode" id="talkMode2" checked={ talkMode === 1 } onChange={() => setTalkMode(1)} />
-                <label className="form-check-label" htmlFor="talkMode2">
-                    { LocalizeText('wiredfurni.params.shout') }
-                </label>
+            <div className="form-group">
+                <div className="form-check">
+                    <input className="form-check-input" type="radio" name="talkMode" id="talkMode1" checked={ (talkMode === 0) } onChange={ event => setTalkMode(0) } />
+                    <label className="form-check-label" htmlFor="talkMode1">{ LocalizeText('wiredfurni.params.talk') }</label>
+                </div>
+                <div className="form-check">
+                    <input className="form-check-input" type="radio" name="talkMode" id="talkMode2" checked={ (talkMode === 1) } onChange={ event => setTalkMode(1) } />
+                    <label className="form-check-label" htmlFor="talkMode2">{ LocalizeText('wiredfurni.params.shout') }</label>
+                </div>
             </div>
         </WiredActionBaseView>
     );
diff --git a/src/views/wired/views/actions/call-another-stack/WiredActionCallAnotherStackView.tsx b/src/views/wired/views/actions/call-another-stack/WiredActionCallAnotherStackView.tsx
index 3a2f37c6..62342124 100644
--- a/src/views/wired/views/actions/call-another-stack/WiredActionCallAnotherStackView.tsx
+++ b/src/views/wired/views/actions/call-another-stack/WiredActionCallAnotherStackView.tsx
@@ -4,7 +4,5 @@ import { WiredActionBaseView } from '../base/WiredActionBaseView';
 
 export const WiredActionCallAnotherStackView: FC<{}> = props =>
 {
-    return (
-        <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_BY_TYPE_OR_FROM_CONTEXT } save={ null }></WiredActionBaseView>
-    );
+    return <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_BY_TYPE_OR_FROM_CONTEXT } save={ null } />;
 }
diff --git a/src/views/wired/views/actions/chase/WiredActionChaseView.tsx b/src/views/wired/views/actions/chase/WiredActionChaseView.tsx
index 91b8ee30..76bcfae0 100644
--- a/src/views/wired/views/actions/chase/WiredActionChaseView.tsx
+++ b/src/views/wired/views/actions/chase/WiredActionChaseView.tsx
@@ -4,7 +4,5 @@ import { WiredActionBaseView } from '../base/WiredActionBaseView';
 
 export const WiredActionChaseView: FC<{}> = props =>
 {
-    return (
-        <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_BY_TYPE_OR_FROM_CONTEXT } save={ null }></WiredActionBaseView>
-    );
+    return <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_BY_TYPE_OR_FROM_CONTEXT } save={ null } />;
 }
diff --git a/src/views/wired/views/actions/flee/WiredActionFleeView.tsx b/src/views/wired/views/actions/flee/WiredActionFleeView.tsx
index 927ffea9..d8e37d0b 100644
--- a/src/views/wired/views/actions/flee/WiredActionFleeView.tsx
+++ b/src/views/wired/views/actions/flee/WiredActionFleeView.tsx
@@ -4,7 +4,5 @@ import { WiredActionBaseView } from '../base/WiredActionBaseView';
 
 export const WiredActionFleeView: FC<{}> = props =>
 {
-    return (
-        <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_BY_TYPE_OR_FROM_CONTEXT } save={ null }></WiredActionBaseView>
-    );
+    return <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_BY_TYPE_OR_FROM_CONTEXT } save={ null } />;
 }
diff --git a/src/views/wired/views/actions/give-score-to-predefined-team/WiredActionGiveScoreToPredefinedTeamView.tsx b/src/views/wired/views/actions/give-score-to-predefined-team/WiredActionGiveScoreToPredefinedTeamView.tsx
index 10defd56..3c5d444a 100644
--- a/src/views/wired/views/actions/give-score-to-predefined-team/WiredActionGiveScoreToPredefinedTeamView.tsx
+++ b/src/views/wired/views/actions/give-score-to-predefined-team/WiredActionGiveScoreToPredefinedTeamView.tsx
@@ -9,7 +9,7 @@ export const WiredActionGiveScoreToPredefinedTeamView: FC<{}> = props =>
 {
     const [ points, setPoints ] = useState(1);
     const [ time, setTime ] = useState(1);
-    const [ selectedTeam, setSelectedTeam ] = useState(-1);
+    const [ selectedTeam, setSelectedTeam ] = useState(1);
     const { trigger = null, setIntParams = null } = useWiredContext();
 
     useEffect(() =>
@@ -20,47 +20,51 @@ export const WiredActionGiveScoreToPredefinedTeamView: FC<{}> = props =>
             setTime(trigger.intData[1]);
             setSelectedTeam(trigger.intData[2]);
         }
+        else
+        {
+            setPoints(1);
+            setTime(1);
+            setSelectedTeam(1);
+        }
     }, [ trigger ]);
 
     const save = useCallback(() =>
     {
-        setIntParams([points, time, selectedTeam]);
+        setIntParams([ points, time, selectedTeam ]);
     }, [ points, time, selectedTeam, setIntParams ]);
 
     return (
         <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ save }>
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.setpoints', [ 'points' ], [ points.toString() ]) }</div>
-            <Slider 
-                defaultValue={ points }
-                dots={ true }
-                min={ 1 }
-                max={ 100 }
-                step={ 1 }
-                onChange={ event => setPoints(event) }
-                />
-            <hr className="my-1 mb-2 bg-dark" />
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.settimesingame', [ 'times' ], [ time.toString() ]) }</div>
-            <Slider 
-                defaultValue={ time }
-                dots={ true }
-                min={ 1 }
-                max={ 10 }
-                step={ 1 }
-                onChange={ event => setTime(event) }
-                />
-            <hr className="my-1 mb-2 bg-dark" />
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.team') }</div>
-            { [1, 2, 3, 4].map(team =>
-            {
-                return (
-                    <div key={ team } className="form-check">
-                        <input className="form-check-input" type="radio" name="selectedTeam" id={'selectedTeam' + team} checked={ selectedTeam === team } onChange={() => setSelectedTeam(team)} />
-                        <label className="form-check-label" htmlFor={'selectedTeam' + team}>
-                            { LocalizeText('wiredfurni.params.team.' + team) }
-                        </label>
-                    </div>
-                )
-            }) }
+            <div className="form-group mb-2">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.setpoints', [ 'points' ], [ points.toString() ]) }</label>
+                <Slider 
+                    value={ points }
+                    min={ 1 }
+                    max={ 100 }
+                    onChange={ event => setPoints(event) } />
+            </div>
+            <div className="form-group mb-2">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.settimesingame', [ 'times' ], [ time.toString() ]) }</label>
+                <Slider 
+                    value={ time }
+                    min={ 1 }
+                    max={ 10 }
+                    onChange={ event => setTime(event) } />
+            </div>
+            <div className="form-group">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.team') }</label>
+                { [1, 2, 3, 4].map(value =>
+                    {
+                        return (
+                            <div key={ value } className="form-check">
+                                <input className="form-check-input" type="radio" name="selectedTeam" id={ `selectedTeam${ value }` } checked={ (selectedTeam === value) } onChange={ event => setSelectedTeam(value) } />
+                                <label className="form-check-label" htmlFor={'selectedTeam' + value}>
+                                    { LocalizeText('wiredfurni.params.team.' + value) }
+                                </label>
+                            </div>
+                        );
+                    }) }
+            </div>
         </WiredActionBaseView>
     );
 }
diff --git a/src/views/wired/views/actions/give-score/WiredActionGiveScoreView.tsx b/src/views/wired/views/actions/give-score/WiredActionGiveScoreView.tsx
index 79e0a3c3..1360e889 100644
--- a/src/views/wired/views/actions/give-score/WiredActionGiveScoreView.tsx
+++ b/src/views/wired/views/actions/give-score/WiredActionGiveScoreView.tsx
@@ -18,34 +18,36 @@ export const WiredActionGiveScoreView: FC<{}> = props =>
             setPoints(trigger.intData[0]);
             setTime(trigger.intData[1]);
         }
+        else
+        {
+            setPoints(1);
+            setTime(1);
+        }
     }, [ trigger ]);
 
     const save = useCallback(() =>
     {
-        setIntParams([points, time]);
+        setIntParams([ points, time ]);
     }, [ points, time, setIntParams ]);
 
     return (
         <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ save }>
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.setpoints', [ 'points' ], [ points.toString() ]) }</div>
-            <Slider 
-                defaultValue={ points }
-                dots={ true }
-                min={ 1 }
-                max={ 100 }
-                step={ 1 }
-                onChange={ event => setPoints(event) }
-                />
-            <hr className="my-1 mb-2 bg-dark" />
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.settimesingame', [ 'times' ], [ time.toString() ]) }</div>
-            <Slider 
-                defaultValue={ time }
-                dots={ true }
-                min={ 1 }
-                max={ 10 }
-                step={ 1 }
-                onChange={ event => setTime(event) }
-                />
+            <div className="form-group mb-2">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.setpoints', [ 'points' ], [ points.toString() ]) }</label>
+                <Slider 
+                    value={ points }
+                    min={ 1 }
+                    max={ 100 }
+                    onChange={ event => setPoints(event) } />
+            </div>
+            <div className="form-group">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.settimesingame', [ 'times' ], [ time.toString() ]) }</label>
+                <Slider 
+                    value={ time }
+                    min={ 1 }
+                    max={ 10 }
+                    onChange={ event => setTime(event) } />
+            </div>
         </WiredActionBaseView>
     );
 }
diff --git a/src/views/wired/views/actions/join-team/WiredActionJoinTeamView.tsx b/src/views/wired/views/actions/join-team/WiredActionJoinTeamView.tsx
index 0219ff36..cf3fb1cb 100644
--- a/src/views/wired/views/actions/join-team/WiredActionJoinTeamView.tsx
+++ b/src/views/wired/views/actions/join-team/WiredActionJoinTeamView.tsx
@@ -16,23 +16,25 @@ export const WiredActionJoinTeamView: FC<{}> = props =>
 
     const save = useCallback(() =>
     {
-        setIntParams([selectedTeam]);
+        setIntParams([ selectedTeam ]);
     }, [ selectedTeam, setIntParams ]);
 
     return (
         <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ save }>
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.team') }</div>
-            { [1, 2, 3, 4].map(team =>
-                {
-                    return (
-                        <div key={ team } className="form-check">
-                            <input className="form-check-input" type="radio" name="selectedTeam" id={'selectedTeam' + team} checked={ selectedTeam === team } onChange={() => setSelectedTeam(team)} />
-                            <label className="form-check-label" htmlFor={'selectedTeam' + team}>
-                                { LocalizeText('wiredfurni.params.team.' + team) }
-                            </label>
-                        </div>
-                    )
-                }) }
+            <div className="form-group">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.team') }</label>
+                { [1, 2, 3, 4].map(team =>
+                    {
+                        return (
+                            <div key={ team } className="form-check">
+                                <input className="form-check-input" type="radio" name="selectedTeam" id={ `selectedTeam${ team }` } checked={ (selectedTeam === team) } onChange={ event => setSelectedTeam(team) } />
+                                <label className="form-check-label" htmlFor={ `selectedTeam${ team }` }>
+                                    { LocalizeText(`wiredfurni.params.team.${ team }`) }
+                                </label>
+                            </div>
+                        )
+                    }) }
+            </div>
         </WiredActionBaseView>
     );
 }
diff --git a/src/views/wired/views/actions/leave-team/WiredActionLeaveTeamView.tsx b/src/views/wired/views/actions/leave-team/WiredActionLeaveTeamView.tsx
index 0ea0dee3..67d13522 100644
--- a/src/views/wired/views/actions/leave-team/WiredActionLeaveTeamView.tsx
+++ b/src/views/wired/views/actions/leave-team/WiredActionLeaveTeamView.tsx
@@ -4,7 +4,5 @@ import { WiredActionBaseView } from '../base/WiredActionBaseView';
 
 export const WiredActionLeaveTeamView: FC<{}> = props =>
 {
-    return (
-        <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ null }></WiredActionBaseView>
-    );
+    return <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ null } />;
 }
diff --git a/src/views/wired/views/actions/move-and-rotate-furni/WiredActionMoveAndRotateFurniView.tsx b/src/views/wired/views/actions/move-and-rotate-furni/WiredActionMoveAndRotateFurniView.tsx
index 24d9cd22..f6b0ef97 100644
--- a/src/views/wired/views/actions/move-and-rotate-furni/WiredActionMoveAndRotateFurniView.tsx
+++ b/src/views/wired/views/actions/move-and-rotate-furni/WiredActionMoveAndRotateFurniView.tsx
@@ -4,7 +4,7 @@ import { useWiredContext } from '../../../context/WiredContext';
 import { WiredFurniType } from '../../../WiredView.types';
 import { WiredActionBaseView } from '../base/WiredActionBaseView';
 
-const directionOptions: {value: number, icon: string}[] = [
+const directionOptions: { value: number, icon: string }[] = [
     {
         value: 0,
         icon: 'ne'
@@ -38,44 +38,52 @@ export const WiredActionMoveAndRotateFurniView: FC<{}> = props =>
             setMovement(trigger.intData[0]);
             setRotation(trigger.intData[1]);
         }
+        else
+        {
+            setMovement(-1);
+            setRotation(-1);
+        }
     }, [ trigger ]);
 
     const save = useCallback(() =>
     {
-        setIntParams([movement, rotation]);
+        setIntParams([ movement, rotation ]);
     }, [ movement, rotation, setIntParams ]);
 
     return (
         <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_BY_TYPE_OR_FROM_CONTEXT } save={ save }>
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.startdir') }</div>
-            <div className="row row-cold-4">
-                { directionOptions.map(option =>
-                    {
-                        return (
-                            <div key={ option.value } className="col">
-                                <div className="form-check">
-                                    <input className="form-check-input" type="radio" name="movement" id={'movement' + option.value} checked={ movement === option.value } onChange={() => setMovement(option.value)} />
-                                    <label className="form-check-label" htmlFor={'movement' + option.value}>
-                                        <i className={'icon icon-' + option.icon} />
-                                    </label>
+            <div className="form-group mb-2">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.startdir') }</label>
+                <div className="row row-cold-4">
+                    { directionOptions.map(option =>
+                        {
+                            return (
+                                <div key={ option.value } className="col">
+                                    <div className="form-check">
+                                        <input className="form-check-input" type="radio" name="movement" id={ `movement${ option.value }` } checked={ (movement === option.value) } onChange={ event => setMovement(option.value) } />
+                                        <label className="form-check-label" htmlFor={ `movement${ option.value }` }>
+                                            <i className={ `icon icon-${ option.icon }` } />
+                                        </label>
+                                    </div>
                                 </div>
-                            </div>
-                        )
-                    }) }
+                            )
+                        }) }
+                </div>
             </div>
-            <hr className="my-1 mb-2 bg-dark" />
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.turn') }</div>
+            <div className="form-group">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.turn') }</label>
                 { rotationOptions.map(option =>
                     {
                         return (
                             <div key={ option } className="form-check">
-                                <input className="form-check-input" type="radio" name="rotation" id={'rotation' + option} checked={ rotation === option } onChange={() => setRotation(option)} />
-                                <label className="form-check-label" htmlFor={'rotation' + option}>
-                                    { LocalizeText('wiredfurni.params.turn.' + option) }
+                                <input className="form-check-input" type="radio" name="rotation" id={ `rotation${ option }` } checked={ (rotation === option) } onChange={ event => setRotation(option) } />
+                                <label className="form-check-label" htmlFor={ `rotation${ option }` }>
+                                    { LocalizeText(`wiredfurni.params.turn.${ option }`) }
                                 </label>
                             </div>
                         )
                     }) }
+            </div>
         </WiredActionBaseView>
     );
 }
diff --git a/src/views/wired/views/actions/move-furni-to/WiredActionMoveFurniToView.tsx b/src/views/wired/views/actions/move-furni-to/WiredActionMoveFurniToView.tsx
index 2b8e8587..96bf209a 100644
--- a/src/views/wired/views/actions/move-furni-to/WiredActionMoveFurniToView.tsx
+++ b/src/views/wired/views/actions/move-furni-to/WiredActionMoveFurniToView.tsx
@@ -5,7 +5,7 @@ import { useWiredContext } from '../../../context/WiredContext';
 import { WiredFurniType } from '../../../WiredView.types';
 import { WiredActionBaseView } from '../base/WiredActionBaseView';
 
-const directionOptions: {value: number, icon: string}[] = [
+const directionOptions: { value: number, icon: string }[] = [
     {
         value: 0,
         icon: 'ne'
@@ -37,40 +37,45 @@ export const WiredActionMoveFurniToView: FC<{}> = props =>
             setSpacing(trigger.intData[1]);
             setMovement(trigger.intData[0]);
         }
+        else
+        {
+            setSpacing(-1);
+            setMovement(-1);
+        }
     }, [ trigger ]);
 
     const save = useCallback(() =>
     {
-        setIntParams([movement, spacing]);
+        setIntParams([ movement, spacing ]);
     }, [ movement, spacing, setIntParams ]);
 
     return (
         <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_OR_BY_TYPE } save={ save }>
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.emptytiles', [ 'tiles' ], [ spacing.toString() ]) }</div>
-            <Slider 
-                defaultValue={ spacing }
-                dots={ true }
-                min={ 1 }
-                max={ 5 }
-                step={ 1 }
-                onChange={ event => setSpacing(event) }
-                />
-            <hr className="my-1 mb-2 bg-dark" />
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.startdir') }</div>
-            <div className="row row-cold-4">
-                { directionOptions.map(option =>
-                    {
-                        return (
-                            <div key={ option.value } className="col">
-                                <div className="form-check">
-                                    <input className="form-check-input" type="radio" name="movement" id={'movement' + option.value} checked={ movement === option.value } onChange={() => setMovement(option.value)} />
-                                    <label className="form-check-label" htmlFor={'movement' + option.value}>
-                                        <i className={'icon icon-' + option.icon} />
-                                    </label>
+            <div className="form-group mb-2">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.emptytiles', [ 'tiles' ], [ spacing.toString() ]) }</label>
+                <Slider 
+                    value={ spacing }
+                    min={ 1 }
+                    max={ 5 }
+                    onChange={ event => setSpacing(event) } />
+            </div>
+            <div className="form-group">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.startdir') }</label>
+                <div className="row row-cold-4">
+                    { directionOptions.map(value =>
+                        {
+                            return (
+                                <div key={ value.value } className="col">
+                                    <div className="form-check">
+                                        <input className="form-check-input" type="radio" name="movement" id={ `movement${ value.value }` } checked={ (movement === value.value) } onChange={ event => setMovement(value.value) } />
+                                        <label className="form-check-label" htmlFor={ `movement${ value.value }` }>
+                                            <i className={ `icon icon-${ value.icon }` } />
+                                        </label>
+                                    </div>
                                 </div>
-                            </div>
-                        )
-                    }) }
+                            )
+                        }) }
+                </div>
             </div>
         </WiredActionBaseView>
     );
diff --git a/src/views/wired/views/actions/move-furni/WiredActionMoveFurniView.tsx b/src/views/wired/views/actions/move-furni/WiredActionMoveFurniView.tsx
index 8bd53a9e..f9107c42 100644
--- a/src/views/wired/views/actions/move-furni/WiredActionMoveFurniView.tsx
+++ b/src/views/wired/views/actions/move-furni/WiredActionMoveFurniView.tsx
@@ -4,7 +4,7 @@ import { useWiredContext } from '../../../context/WiredContext';
 import { WiredFurniType } from '../../../WiredView.types';
 import { WiredActionBaseView } from '../base/WiredActionBaseView';
 
-const directionOptions: {value: number, icon: string}[] = [
+const directionOptions: { value: number, icon: string }[] = [
     {
         value: 4,
         icon: 'ne'
@@ -50,52 +50,60 @@ export const WiredActionMoveFurniView: FC<{}> = props =>
             setMovement(trigger.intData[0]);
             setRotation(trigger.intData[1]);
         }
+        else
+        {
+            setMovement(-1);
+            setRotation(-1);
+        }
     }, [ trigger ]);
 
     const save = useCallback(() =>
     {
-        setIntParams([movement, rotation]);
+        setIntParams([ movement, rotation ]);
     }, [ movement, rotation, setIntParams ]);
 
     return (
         <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_BY_TYPE_OR_FROM_CONTEXT } save={ save }>
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.movefurni') }</div>
-            <div className="form-check">
-                <input className="form-check-input" type="radio" name="selectedTeam" id="movement0" checked={ movement === 0 } onChange={() => setMovement(0)} />
-                <label className="form-check-label" htmlFor="movement0">
-                    { LocalizeText('wiredfurni.params.movefurni.0') }
-                </label>
+            <div className="form-group mb-2">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.movefurni') }</label>
+                <div className="form-check">
+                    <input className="form-check-input" type="radio" name="selectedTeam" id="movement0" checked={ (movement === 0) } onChange={ event => setMovement(0) } />
+                    <label className="form-check-label" htmlFor="movement0">
+                        { LocalizeText('wiredfurni.params.movefurni.0') }
+                    </label>
+                </div>
+                <div className="row row-col-4">
+                    { directionOptions.map(option =>
+                        {
+                            return (
+                                <div key={ option.value } className="col">
+                                    <div className="form-check">
+                                        <input className="form-check-input" type="radio" name="movement" id={ `movement${ option.value }` } checked={ (movement === option.value) } onChange={ event => setMovement(option.value) } />
+                                        <label className="form-check-label" htmlFor={ `movement${ option.value }` }>
+                                            <i className={ `icon icon-${ option.icon }` } />
+                                        </label>
+                                    </div>
+                                </div>
+                            )
+                        }) }
+                    <div className="col" />
+                </div>
             </div>
-            <div className="row row-cold-4">
-                { directionOptions.map(option =>
-                    {
-                        return (
-                            <div key={ option.value } className="col">
-                                <div className="form-check">
-                                    <input className="form-check-input" type="radio" name="movement" id={'movement' + option.value} checked={ movement === option.value } onChange={() => setMovement(option.value)} />
-                                    <label className="form-check-label" htmlFor={'movement' + option.value}>
-                                        <i className={'icon icon-' + option.icon} />
+            <div className="form-group">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.rotatefurni') }</label>
+                { rotationOptions.map(option =>
+                        {
+                            return (
+                                <div key={ option } className="form-check">
+                                    <input className="form-check-input" type="radio" name="rotation" id={ `rotation${ option }` } checked={ (rotation === option) } onChange={ event => setRotation(option) } />
+                                    <label className="form-check-label" htmlFor={'rotation' + option}>
+                                        { [1, 2].includes(option) && <i className={ `icon icon-rot-${ option }` } /> }
+                                        { LocalizeText(`wiredfurni.params.rotatefurni.${ option }`) }
                                     </label>
                                 </div>
-                            </div>
-                        )
-                    }) }
-                <div className="col"></div>
+                            )
+                        }) }
             </div>
-            <hr className="my-1 mb-2 bg-dark" />
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.rotatefurni') }</div>
-            { rotationOptions.map(option =>
-                    {
-                        return (
-                            <div key={ option } className="form-check">
-                                <input className="form-check-input" type="radio" name="rotation" id={'rotation' + option} checked={ rotation === option } onChange={() => setRotation(option)} />
-                                <label className="form-check-label" htmlFor={'rotation' + option}>
-                                    { [1, 2].includes(option) && <i className={'icon icon-rot-' + option} /> }
-                                    { LocalizeText('wiredfurni.params.rotatefurni.' + option) }
-                                </label>
-                            </div>
-                        )
-                    }) }
         </WiredActionBaseView>
     );
 }
diff --git a/src/views/wired/views/actions/mute-user/WiredActionMuteUserView.tsx b/src/views/wired/views/actions/mute-user/WiredActionMuteUserView.tsx
index c17cf3c9..1c6f912f 100644
--- a/src/views/wired/views/actions/mute-user/WiredActionMuteUserView.tsx
+++ b/src/views/wired/views/actions/mute-user/WiredActionMuteUserView.tsx
@@ -19,23 +19,20 @@ export const WiredActionMuteUserView: FC<{}> = props =>
 
     const save = useCallback(() =>
     {
-        setIntParams([time]);
+        setIntParams([ time ]);
         setStringParam(message);
     }, [ time, message, setIntParams, setStringParam ]);
 
     return (
         <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ save }>
-           
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.length.minutes', ['minutes'], [time.toString()]) }</div>
-            <Slider 
-                defaultValue={ time }
-                dots={ true }
-                min={ 1 }
-                max={ 10 }
-                step={ 1 }
-                onChange={ event => setTime(event) }
-                />
-            <hr className="my-1 mb-2 bg-dark" />
+            <div className="form-group mb-2">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.length.minutes', ['minutes'], [ time.toString() ]) }</label>
+                <Slider 
+                    value={ time }
+                    min={ 1 }
+                    max={ 10 }
+                    onChange={ event => setTime(event) } />
+            </div>
             <div className="form-group">
                 <label className="fw-bold">{ LocalizeText('wiredfurni.params.message') }</label>
                 <input type="text" className="form-control form-control-sm" value={ message } onChange={ event => setMessage(event.target.value) } />
diff --git a/src/views/wired/views/actions/reset/WiredActionResetView.tsx b/src/views/wired/views/actions/reset/WiredActionResetView.tsx
index ff977014..23d4cbf5 100644
--- a/src/views/wired/views/actions/reset/WiredActionResetView.tsx
+++ b/src/views/wired/views/actions/reset/WiredActionResetView.tsx
@@ -4,7 +4,5 @@ import { WiredActionBaseView } from '../base/WiredActionBaseView';
 
 export const WiredActionResetView: FC<{}> = props =>
 {
-    return (
-        <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ null }></WiredActionBaseView>
-    );
+    return <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ null } />;
 }
diff --git a/src/views/wired/views/actions/set-furni-state-to/WiredActionSetFurniStateToView.tsx b/src/views/wired/views/actions/set-furni-state-to/WiredActionSetFurniStateToView.tsx
index 58074134..d3d5d82e 100644
--- a/src/views/wired/views/actions/set-furni-state-to/WiredActionSetFurniStateToView.tsx
+++ b/src/views/wired/views/actions/set-furni-state-to/WiredActionSetFurniStateToView.tsx
@@ -20,29 +20,31 @@ export const WiredActionSetFurniStateToView: FC<{}> = props =>
 
     const save = useCallback(() =>
     {
-        setIntParams([stateFlag, directionFlag, positionFlag]);
-    }, [ directionFlag, positionFlag, setIntParams, stateFlag ]);
+        setIntParams([ stateFlag, directionFlag, positionFlag ]);
+    }, [ directionFlag, positionFlag, stateFlag, setIntParams ]);
 
     return (
         <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID } save={ save }>
-            <div className="fw-bold">{ LocalizeText('wiredfurni.params.conditions') }</div>
-            <div className="form-check">
-                <input className="form-check-input" type="checkbox" id="stateFlag" onChange={(e) => setStateFlag(e.target.checked ? 1 : 0)} />
-                <label className="form-check-label" htmlFor="stateFlag">
-                    { LocalizeText('wiredfurni.params.condition.state') }
-                </label>
-            </div>
-            <div className="form-check">
-                <input className="form-check-input" type="checkbox" id="directionFlag" onChange={(e) => setDirectionFlag(e.target.checked ? 1 : 0)} />
-                <label className="form-check-label" htmlFor="directionFlag">
-                    { LocalizeText('wiredfurni.params.condition.direction') }
-                </label>
-            </div>
-            <div className="form-check">
-                <input className="form-check-input" type="checkbox" id="positionFlag" onChange={(e) => setPositionFlag(e.target.checked ? 1 : 0)} />
-                <label className="form-check-label" htmlFor="positionFlag">
-                    { LocalizeText('wiredfurni.params.condition.position') }
-                </label>
+            <div className="form-group">
+                <label className="fw-bold">{ LocalizeText('wiredfurni.params.conditions') }</label>
+                <div className="form-check">
+                    <input className="form-check-input" type="checkbox" id="stateFlag" onChange={ event => setStateFlag(event.target.checked ? 1 : 0) } />
+                    <label className="form-check-label" htmlFor="stateFlag">
+                        { LocalizeText('wiredfurni.params.condition.state') }
+                    </label>
+                </div>
+                <div className="form-check">
+                    <input className="form-check-input" type="checkbox" id="directionFlag" onChange={ event => setDirectionFlag(event.target.checked ? 1 : 0) } />
+                    <label className="form-check-label" htmlFor="directionFlag">
+                        { LocalizeText('wiredfurni.params.condition.direction') }
+                    </label>
+                </div>
+                <div className="form-check">
+                    <input className="form-check-input" type="checkbox" id="positionFlag" onChange={ event => setPositionFlag(event.target.checked ? 1 : 0) } />
+                    <label className="form-check-label" htmlFor="positionFlag">
+                        { LocalizeText('wiredfurni.params.condition.position') }
+                    </label>
+                </div>
             </div>
         </WiredActionBaseView>
     );
diff --git a/src/views/wired/views/actions/teleport/WiredActionTeleportView.tsx b/src/views/wired/views/actions/teleport/WiredActionTeleportView.tsx
index 3fb54dde..f4390f4e 100644
--- a/src/views/wired/views/actions/teleport/WiredActionTeleportView.tsx
+++ b/src/views/wired/views/actions/teleport/WiredActionTeleportView.tsx
@@ -4,7 +4,5 @@ import { WiredActionBaseView } from '../base/WiredActionBaseView';
 
 export const WiredActionTeleportView: FC<{}> = props =>
 {
-    return (
-        <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_BY_TYPE_OR_FROM_CONTEXT } save={ null }></WiredActionBaseView>
-    );
+    return <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_BY_TYPE_OR_FROM_CONTEXT } save={ null } />;
 }
diff --git a/src/views/wired/views/actions/toggle-furni-state/WiredActionToggleFurniStateView.tsx b/src/views/wired/views/actions/toggle-furni-state/WiredActionToggleFurniStateView.tsx
index d816ed0a..fc7aed91 100644
--- a/src/views/wired/views/actions/toggle-furni-state/WiredActionToggleFurniStateView.tsx
+++ b/src/views/wired/views/actions/toggle-furni-state/WiredActionToggleFurniStateView.tsx
@@ -4,7 +4,5 @@ import { WiredActionBaseView } from '../base/WiredActionBaseView';
 
 export const WiredActionToggleFurniStateView: FC<{}> = props =>
 {
-    return (
-        <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_BY_TYPE_OR_FROM_CONTEXT } save={ null }></WiredActionBaseView>
-    );
+    return <WiredActionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_BY_ID_BY_TYPE_OR_FROM_CONTEXT } save={ null } />;
 }