diff --git a/indra/newview/ao.cpp b/indra/newview/ao.cpp
index cea9031dc8..addaddd168 100644
--- a/indra/newview/ao.cpp
+++ b/indra/newview/ao.cpp
@@ -35,6 +35,7 @@
 #include "llcombobox.h"
 #include "llnotificationsutil.h"
 #include "llspinctrl.h"
+#include "llviewercontrol.h"
 #include "llviewerinventory.h"
 
 FloaterAO::FloaterAO(const LLSD& key)
@@ -43,7 +44,8 @@ FloaterAO::FloaterAO(const LLSD& key)
 	mSelectedSet(0),
 	mSelectedState(0),
 	mCanDragAndDrop(FALSE),
-	mImportRunning(FALSE)
+	mImportRunning(FALSE),
+	mMore(TRUE)
 {
 }
 
@@ -61,6 +63,7 @@ void FloaterAO::reloading(BOOL yes)
 void FloaterAO::updateSetParameters()
 {
 	mOverrideSitsCheckBox->setValue(mSelectedSet->getSitOverride());
+	mOverrideSitsCheckBoxSmall->setValue(mSelectedSet->getSitOverride());
 	mSmartCheckBox->setValue(mSelectedSet->getSmart());
 	mDisableMouselookCheckBox->setValue(mSelectedSet->getMouselookDisable());
 	BOOL isDefault=(mSelectedSet==AOEngine::instance().getDefaultSet()) ? TRUE : FALSE;
@@ -111,8 +114,12 @@ void FloaterAO::updateList()
 
 	mSetList=AOEngine::instance().getSetList();
 	mSetSelector->removeall();
+	mSetSelectorSmall->removeall();
 	mSetSelector->clear();
+	mSetSelectorSmall->clear();
+
 	mAnimationList->deleteAllItems();
+	reloading(FALSE);
 
 	if(mSetList.empty())
 	{
@@ -125,46 +132,55 @@ void FloaterAO::updateList()
 	{
 		std::string setName=mSetList[index]->getName();
 		mSetSelector->add(setName,&mSetList[index],ADD_BOTTOM,TRUE);
+		mSetSelectorSmall->add(setName,&mSetList[index],ADD_BOTTOM,TRUE);
 		if(setName.compare(currentSetName)==0)
 		{
 			mSelectedSet=AOEngine::instance().selectSetByName(currentSetName);
 			mSetSelector->selectNthItem(index);
+			mSetSelectorSmall->selectNthItem(index);
 			updateSetParameters();
 			updateAnimationList();
 		}
 	}
 	enableSetControls(TRUE);
-	reloading(FALSE);
 }
 
 BOOL FloaterAO::postBuild()
 {
-	LLPanel* aoPanel=getChild<LLPanel>("animation_overrider_panel");
-
+	LLPanel* aoPanel=getChild<LLPanel>("animation_overrider_outer_panel");
+	mMainInterfacePanel=aoPanel->getChild<LLPanel>("animation_overrider_panel");
+	mSmallInterfacePanel=aoPanel->getChild<LLPanel>("animation_overrider_panel_small");
 	mReloadCoverPanel=aoPanel->getChild<LLPanel>("ao_reload_cover");
 
-	mSetSelector=aoPanel->getChild<LLComboBox>("ao_set_selection_combo");
-	mActivateSetButton=aoPanel->getChild<LLButton>("ao_activate");
-	mAddButton=aoPanel->getChild<LLButton>("ao_add");
-	mRemoveButton=aoPanel->getChild<LLButton>("ao_remove");
-	mDefaultCheckBox=aoPanel->getChild<LLCheckBoxCtrl>("ao_default");
-	mOverrideSitsCheckBox=aoPanel->getChild<LLCheckBoxCtrl>("ao_sit_override");
-	mSmartCheckBox=aoPanel->getChild<LLCheckBoxCtrl>("ao_smart");
-	mDisableMouselookCheckBox=aoPanel->getChild<LLCheckBoxCtrl>("ao_disable_stands_in_mouselook");
+	mSetSelector=mMainInterfacePanel->getChild<LLComboBox>("ao_set_selection_combo");
+	mActivateSetButton=mMainInterfacePanel->getChild<LLButton>("ao_activate");
+	mAddButton=mMainInterfacePanel->getChild<LLButton>("ao_add");
+	mRemoveButton=mMainInterfacePanel->getChild<LLButton>("ao_remove");
+	mDefaultCheckBox=mMainInterfacePanel->getChild<LLCheckBoxCtrl>("ao_default");
+	mOverrideSitsCheckBox=mMainInterfacePanel->getChild<LLCheckBoxCtrl>("ao_sit_override");
+	mSmartCheckBox=mMainInterfacePanel->getChild<LLCheckBoxCtrl>("ao_smart");
+	mDisableMouselookCheckBox=mMainInterfacePanel->getChild<LLCheckBoxCtrl>("ao_disable_stands_in_mouselook");
 
-	mStateSelector=aoPanel->getChild<LLComboBox>("ao_state_selection_combo");
-	mAnimationList=aoPanel->getChild<LLScrollListCtrl>("ao_state_animation_list");
-	mMoveUpButton=aoPanel->getChild<LLButton>("ao_move_up");
-	mMoveDownButton=aoPanel->getChild<LLButton>("ao_move_down");
-	mTrashButton=aoPanel->getChild<LLButton>("ao_trash");
-	mCycleCheckBox=aoPanel->getChild<LLCheckBoxCtrl>("ao_cycle");
-	mRandomizeCheckBox=aoPanel->getChild<LLCheckBoxCtrl>("ao_randomize");
-	mCycleTimeTextLabel=aoPanel->getChild<LLTextBox>("ao_cycle_time_seconds_label");
-	mCycleTimeSpinner=aoPanel->getChild<LLSpinCtrl>("ao_cycle_time");
+	mStateSelector=mMainInterfacePanel->getChild<LLComboBox>("ao_state_selection_combo");
+	mAnimationList=mMainInterfacePanel->getChild<LLScrollListCtrl>("ao_state_animation_list");
+	mMoveUpButton=mMainInterfacePanel->getChild<LLButton>("ao_move_up");
+	mMoveDownButton=mMainInterfacePanel->getChild<LLButton>("ao_move_down");
+	mTrashButton=mMainInterfacePanel->getChild<LLButton>("ao_trash");
+	mCycleCheckBox=mMainInterfacePanel->getChild<LLCheckBoxCtrl>("ao_cycle");
+	mRandomizeCheckBox=mMainInterfacePanel->getChild<LLCheckBoxCtrl>("ao_randomize");
+	mCycleTimeTextLabel=mMainInterfacePanel->getChild<LLTextBox>("ao_cycle_time_seconds_label");
+	mCycleTimeSpinner=mMainInterfacePanel->getChild<LLSpinCtrl>("ao_cycle_time");
 
-	mPreviousButton=aoPanel->getChild<LLButton>("ao_previous");
-	mNextButton=aoPanel->getChild<LLButton>("ao_next");
-	mReloadButton=aoPanel->getChild<LLButton>("ao_reload");
+	mReloadButton=mMainInterfacePanel->getChild<LLButton>("ao_reload");
+	mPreviousButton=mMainInterfacePanel->getChild<LLButton>("ao_previous");
+	mNextButton=mMainInterfacePanel->getChild<LLButton>("ao_next");
+	mLessButton=mMainInterfacePanel->getChild<LLButton>("ao_less");
+
+	mSetSelectorSmall=mSmallInterfacePanel->getChild<LLComboBox>("ao_set_selection_combo_small");
+	mMoreButton=mSmallInterfacePanel->getChild<LLButton>("ao_more");
+	mPreviousButtonSmall=mSmallInterfacePanel->getChild<LLButton>("ao_previous_small");
+	mNextButtonSmall=mSmallInterfacePanel->getChild<LLButton>("ao_next_small");
+	mOverrideSitsCheckBoxSmall=mSmallInterfacePanel->getChild<LLCheckBoxCtrl>("ao_sit_override_small");
 
 	mSetSelector->setCommitCallback(boost::bind(&FloaterAO::onSelectSet,this));
 	mActivateSetButton->setCommitCallback(boost::bind(&FloaterAO::onClickActivate,this));
@@ -175,9 +191,6 @@ BOOL FloaterAO::postBuild()
 	mSmartCheckBox->setCommitCallback(boost::bind(&FloaterAO::onCheckSmart,this));
 	mDisableMouselookCheckBox->setCommitCallback(boost::bind(&FloaterAO::onCheckDisableStands,this));
 
-	mPreviousButton->setCommitCallback(boost::bind(&FloaterAO::onClickPrevious,this));
-	mNextButton->setCommitCallback(boost::bind(&FloaterAO::onClickNext,this));
-
 	mAnimationList->setCommitOnSelectionChange(TRUE);
 
 	mStateSelector->setCommitCallback(boost::bind(&FloaterAO::onSelectState,this));
@@ -189,16 +202,28 @@ BOOL FloaterAO::postBuild()
 	mRandomizeCheckBox->setCommitCallback(boost::bind(&FloaterAO::onCheckRandomize,this));
 	mCycleTimeSpinner->setCommitCallback(boost::bind(&FloaterAO::onChangeCycleTime,this));
 
-	updateSmart();
-
 	mReloadButton->setCommitCallback(boost::bind(&FloaterAO::onClickReload,this));
+	mPreviousButton->setCommitCallback(boost::bind(&FloaterAO::onClickPrevious,this));
+	mNextButton->setCommitCallback(boost::bind(&FloaterAO::onClickNext,this));
+	mLessButton->setCommitCallback(boost::bind(&FloaterAO::onClickLess,this));
+	mOverrideSitsCheckBoxSmall->setCommitCallback(boost::bind(&FloaterAO::onCheckOverrideSitsSmall,this));
+
+	mSetSelectorSmall->setCommitCallback(boost::bind(&FloaterAO::onSelectSetSmall,this));
+	mMoreButton->setCommitCallback(boost::bind(&FloaterAO::onClickMore,this));
+	mPreviousButtonSmall->setCommitCallback(boost::bind(&FloaterAO::onClickPrevious,this));
+	mNextButtonSmall->setCommitCallback(boost::bind(&FloaterAO::onClickNext,this));
+
+	updateSmart();
 
 	AOEngine::instance().setReloadCallback(boost::bind(&FloaterAO::updateList,this));
 
-	enableSetControls(FALSE);
 	onChangeAnimationSelection();
+	mMainInterfacePanel->setVisible(TRUE);
+	mSmallInterfacePanel->setVisible(FALSE);
+	reloading(TRUE);
 
 	updateList();
+
 	return LLDockableFloater::postBuild();
 }
 
@@ -249,6 +274,16 @@ void FloaterAO::onSelectSet()
 	}
 }
 
+void FloaterAO::onSelectSetSmall()
+{
+	mSelectedSet=AOEngine::instance().getSetByName(mSetSelectorSmall->getSelectedItemLabel());
+	if(mSelectedSet)
+	{
+		updateSetParameters();
+		updateAnimationList();
+	}
+}
+
 void FloaterAO::onClickActivate()
 {
 	lldebugs << "Set activated: " << mSetSelector->getSelectedItemLabel() << llendl;
@@ -373,8 +408,10 @@ BOOL FloaterAO::removeSetCallback(const LLSD& notification,const LLSD& response)
 			reloading(TRUE);
 			// to prevent snapping back to deleted set
 			mSetSelector->removeall();
+			mSetSelectorSmall->removeall();
 			// visually indicate there are no items left
 			mSetSelector->clear();
+			mSetSelectorSmall->clear();
 			mAnimationList->deleteAllItems();
 			return TRUE;
 		}
@@ -390,11 +427,18 @@ void FloaterAO::onCheckDefault()
 
 void FloaterAO::onCheckOverrideSits()
 {
+	mOverrideSitsCheckBoxSmall->setValue(mOverrideSitsCheckBox->getValue());
 	if(mSelectedSet)
 		AOEngine::instance().setOverrideSits(mSelectedSet,mOverrideSitsCheckBox->getValue().asBoolean());
 	updateSmart();
 }
 
+void FloaterAO::onCheckOverrideSitsSmall()
+{
+	mOverrideSitsCheckBox->setValue(mOverrideSitsCheckBoxSmall->getValue());
+	onCheckOverrideSits();
+}
+
 void FloaterAO::updateSmart()
 {
 	mSmartCheckBox->setEnabled(mOverrideSitsCheckBox->getValue());
@@ -529,10 +573,50 @@ void FloaterAO::onClickNext()
 	AOEngine::instance().cycle(AOEngine::CycleNext);
 }
 
+void FloaterAO::onClickMore()
+{
+	LLRect fullSize=gSavedPerAccountSettings.getRect("floater_rect_animation_overrider");
+	LLRect smallSize=getRect();
+
+	mMore=TRUE;
+
+	mSmallInterfacePanel->setVisible(FALSE);
+	mMainInterfacePanel->setVisible(TRUE);
+	setCanResize(TRUE);
+
+	reshape(getRect().getWidth(),fullSize.getHeight());
+}
+
+void FloaterAO::onClickLess()
+{
+	LLRect fullSize=getRect();
+	LLRect smallSize=mSmallInterfacePanel->getRect();
+	smallSize.setLeftTopAndSize(0,0,smallSize.getWidth(),smallSize.getHeight()+getHeaderHeight());
+
+	mMore=FALSE;
+
+	mSmallInterfacePanel->setVisible(TRUE);
+	mMainInterfacePanel->setVisible(FALSE);
+	setCanResize(FALSE);
+
+	reshape(getRect().getWidth(),smallSize.getHeight());
+
+	// save current size and position
+	gSavedPerAccountSettings.setRect("floater_rect_animation_overrider",fullSize);
+}
+
 // virtual
 BOOL FloaterAO::handleDragAndDrop(S32 x,S32 y,MASK mask,BOOL drop,EDragAndDropType type,void* data,
 									EAcceptance* accept,std::string& tooltipMsg)
 {
+	// no drag & drop on small interface
+	if(!mMore)
+	{
+		tooltipMsg="ao_dnd_only_on_full_interface";
+		*accept=ACCEPT_NO;
+		return TRUE;
+	}
+
 	LLInventoryItem* item=(LLInventoryItem*) data;
 
 	if(type==DAD_NOTECARD)
diff --git a/indra/newview/ao.h b/indra/newview/ao.h
index f9dbaa6320..ef898817a6 100644
--- a/indra/newview/ao.h
+++ b/indra/newview/ao.h
@@ -62,6 +62,7 @@ class FloaterAO
 		LLScrollListItem* addAnimation(const std::string name);
 
 		void onSelectSet();
+		void onSelectSetSmall();
 		void onSelectState();
 		void onChangeAnimationSelection();
 		void onClickReload();
@@ -70,6 +71,7 @@ class FloaterAO
 		void onClickActivate();
 		void onCheckDefault();
 		void onCheckOverrideSits();
+		void onCheckOverrideSitsSmall();
 		void onCheckSmart();
 		void onCheckDisableStands();
 		void onClickMoveUp();
@@ -81,6 +83,9 @@ class FloaterAO
 		void onClickPrevious();
 		void onClickNext();
 
+		void onClickMore();
+		void onClickLess();
+
 		void reloading(BOOL yes);
 
 		void updateSmart();
@@ -97,6 +102,11 @@ class FloaterAO
 		AOSet::AOState* mSelectedState;
 
 		LLPanel* mReloadCoverPanel;
+
+		// Full interface
+
+		LLPanel* mMainInterfacePanel;
+
 		LLComboBox* mSetSelector;
 		LLButton* mActivateSetButton;
 		LLButton* mAddButton;
@@ -120,9 +130,21 @@ class FloaterAO
 
 		LLButton* mPreviousButton;
 		LLButton* mNextButton;
+		LLButton* mLessButton;
+
+		// Small interface
+
+		LLPanel* mSmallInterfacePanel;
+
+		LLComboBox* mSetSelectorSmall;
+		LLButton* mMoreButton;
+		LLButton* mPreviousButtonSmall;
+		LLButton* mNextButtonSmall;
+		LLCheckBoxCtrl* mOverrideSitsCheckBoxSmall;
 
 		BOOL mCanDragAndDrop;
 		BOOL mImportRunning;
+		BOOL mMore;
 };
 
 #endif // AO_H
diff --git a/indra/newview/skins/default/xui/en/floater_ao.xml b/indra/newview/skins/default/xui/en/floater_ao.xml
index cab1721b71..7732ed57a6 100644
--- a/indra/newview/skins/default/xui/en/floater_ao.xml
+++ b/indra/newview/skins/default/xui/en/floater_ao.xml
@@ -28,7 +28,7 @@
 	</floater.string>
 
 	<panel
-		name="animation_overrider_panel"
+		name="animation_overrider_outer_panel"
 		filename="panel_ao.xml"
 		left="0"
 		top="16"
diff --git a/indra/newview/skins/default/xui/en/panel_ao.xml b/indra/newview/skins/default/xui/en/panel_ao.xml
index 052ed1144e..27e4c72433 100644
--- a/indra/newview/skins/default/xui/en/panel_ao.xml
+++ b/indra/newview/skins/default/xui/en/panel_ao.xml
@@ -1,12 +1,15 @@
 <panel
-	name="animation_overrider_outer panel"
+	name="animation_overrider_outer_panel"
 	left="0"
 	top="0"
 	width="200"
 	height="314"
 	follows="all"
+	visible="true"
 	layout="topleft">
 
+<!-- Main Panel -->
+
 	<panel
 		name="animation_overrider_panel"
 		left="10"
@@ -14,27 +17,28 @@
 		width="180"
 		height="306"
 		follows="all"
+		visible="true"
 		layout="topleft">
 
-	<combo_box
-		name="ao_set_selection_combo"
-		tool_tip="Select animation set to edit."
-		left="0"
-		top="4"
-		right="-24"
-		height="20"
-		allow_text_entry="true"
-		follows="left|right|top"
-		layout="topleft" />
+		<combo_box
+			name="ao_set_selection_combo"
+			tool_tip="Select animation set to edit."
+			left="0"
+			top="4"
+			right="-24"
+			height="20"
+			allow_text_entry="true"
+			follows="left|right|top"
+			layout="topleft" />
 
-	<button
-		name="ao_activate"
-		tool_tip="Activate this animation set now."
-		left_pad="4"
-		width="20"
-		height="20"
-		follows="right|top"
-		layout="topleft" />
+		<button
+			name="ao_activate"
+			tool_tip="Activate this animation set now."
+			left_pad="4"
+			width="20"
+			height="20"
+			follows="right|top"
+			layout="topleft" />
 
 		<icon
 			left_delta="4"
@@ -45,248 +49,249 @@
 			follows="right|top"
 			layout="topleft" />
 
-	<panel
-		name="ao_more"
-		left="0"
-		top_pad="4"
-		right="-1"
-		height="252"
-		follows="all"
-		layout="topleft">
-
-	<check_box
-		name="ao_default"
-		label="Default"
-		tool_tip="Make this animation set the default."
-		left="0"
-		top_pad="4"
-		width="20"
-		height="20"
-		follows="left|top"
-		layout="topleft" />
-
-	<button
-		name="ao_add"
-		tool_tip="Create a new animation set."
-		top_delta="0"
-		right="-24"
-		width="20"
-		height="20"
-		image_overlay="AddItem_Press"
-		follows="right|top"
-		layout="topleft" />
-
-	<button
-		name="ao_remove"
-		tool_tip="Remove this animation set."
-		left_pad="4"
-		width="20"
-		height="20"
-		image_overlay="TrashItem_Press"
-		follows="right|top"
-		layout="topleft" />
-
-	<check_box
-		name="ao_sit_override"
-		label="Override Sits"
-		tool_tip="Check this if you want sit animation overrides."
-		left="0"
-		top_pad="4"
-		width="100"
-		height="16"
-		follows="left|top"
-		layout="topleft" />
-
-	<check_box
-		name="ao_smart"
-		label="Be smart"
-		tool_tip="Smart mode tries to determine if the sit override would clash with the object's own animation and disables the overrider temporarily."
-		left_pad="4"
-		right="-1"
-		height="16"
-		follows="left|top"
-		layout="topleft" />
-
-	<check_box
-		name="ao_disable_stands_in_mouselook"
-		label="Disable Stands in Mouselook"
-		tool_tip="If you need to preserve your custom stand animation in mouselook, check this box."
-		left="0"
-		top_pad="4"
-		width="100"
-		height="16"
-		follows="left|top"
-		layout="topleft" />
-
-	<combo_box
-		name="ao_state_selection_combo"
-		tool_tip="Select animation state to edit."
-		left="0"
-		top_pad="4"
-		right="-1"
-		height="20"
-		follows="left|right|top"
-		layout="topleft" />
-
-	<scroll_list
-		name="ao_state_animation_list"
-		top_pad="4"
-		right="-24"
-		height="98"
-		multi_select="true"
-		follows="all"
-		layout="topleft" />
-
-	<panel
-		name="ao_animation_move_trash_panel"
-		left_pad="4"
-		right="-1"
-		height="98"
-		follows="right|top|bottom"
-		layout="topleft">
-
-		<button
-			name="ao_move_up"
-			tool_tip="Move the selected animation up in the list."
+		<check_box
+			name="ao_default"
+			label="Default"
+			tool_tip="Make this animation set the default."
 			left="0"
-			top="0"
+			top_pad="8"
 			width="20"
-			height="32"
-			image_overlay="Arrow_Up"
+			height="20"
 			follows="left|top"
 			layout="topleft" />
 
 		<button
-			name="ao_move_down"
-			tool_tip="Move the selected animation down in the list."
-			top_pad="4"
+			name="ao_add"
+			tool_tip="Create a new animation set."
+			top_delta="0"
+			right="-24"
 			width="20"
-			height="32"
-			image_overlay="Arrow_Down"
-			follows="left|top"
+			height="20"
+			image_overlay="AddItem_Press"
+			follows="right|top"
 			layout="topleft" />
 
 		<button
-			name="ao_trash"
-			tool_tip="Remove the selected animation from the list."
-			left_delta="0"
-			bottom="-1"
+			name="ao_remove"
+			tool_tip="Remove this animation set."
+			left_pad="4"
 			width="20"
 			height="20"
 			image_overlay="TrashItem_Press"
+			follows="right|top"
+			layout="topleft" />
+
+		<check_box
+			name="ao_sit_override"
+			label="Override Sits"
+			tool_tip="Check this if you want sit animation overrides."
+			left="0"
+			top_pad="4"
+			width="100"
+			height="16"
+			follows="left|top"
+			layout="topleft" />
+
+		<check_box
+			name="ao_smart"
+			label="Be smart"
+			tool_tip="Smart mode tries to determine if the sit override would clash with the object's own animation and disables the overrider temporarily."
+			left_pad="4"
+			right="-1"
+			height="16"
+			follows="left|top"
+			layout="topleft" />
+
+		<check_box
+			name="ao_disable_stands_in_mouselook"
+			label="Disable Stands in Mouselook"
+			tool_tip="If you need to preserve your custom stand animation in mouselook, check this box."
+			left="0"
+			top_pad="4"
+			width="100"
+			height="16"
+			follows="left|top"
+			layout="topleft" />
+
+		<combo_box
+			name="ao_state_selection_combo"
+			tool_tip="Select animation state to edit."
+			left="0"
+			top_pad="4"
+			right="-1"
+			height="20"
+			follows="left|right|top"
+			layout="topleft" />
+
+		<scroll_list
+			name="ao_state_animation_list"
+			top_pad="4"
+			right="-24"
+			height="98"
+			multi_select="true"
+			follows="all"
+			layout="topleft" />
+
+		<panel
+			name="ao_animation_move_trash_panel"
+			left_pad="4"
+			right="-1"
+			height="98"
+			follows="right|top|bottom"
+			layout="topleft">
+
+			<button
+				name="ao_move_up"
+				tool_tip="Move the selected animation up in the list."
+				left="0"
+				top="0"
+				width="20"
+				height="32"
+				image_overlay="Arrow_Up"
+				follows="left|top"
+				layout="topleft" />
+
+			<button
+				name="ao_move_down"
+				tool_tip="Move the selected animation down in the list."
+				top_pad="4"
+				width="20"
+				height="32"
+				image_overlay="Arrow_Down"
+				follows="left|top"
+				layout="topleft" />
+
+			<button
+				name="ao_trash"
+				tool_tip="Remove the selected animation from the list."
+				left_delta="0"
+				bottom="-1"
+				width="20"
+				height="20"
+				image_overlay="TrashItem_Press"
+				follows="left|bottom"
+				layout="topleft" />
+		</panel>
+
+		<check_box
+			name="ao_cycle"
+			label="Cycle"
+			tool_tip="Play a different animation from the list every time the animation state is called.."
+			left="0"
+			top_pad="4"
+			width="55"
+			height="16"
 			follows="left|bottom"
 			layout="topleft" />
-	</panel>
 
-	<check_box
-		name="ao_cycle"
-		label="Cycle"
-		tool_tip="Play a different animation from the list every time the animation state is called.."
-		left="0"
-		top_pad="4"
-		width="55"
-		height="16"
-		follows="left|bottom"
-		layout="topleft" />
+		<check_box
+			name="ao_randomize"
+			label="Randomize order"
+			tool_tip="Randomize order of animations in cycle mode."
+			left_pad="4"
+			width="100"
+			height="16"
+			follows="left|bottom"
+			layout="topleft" />
 
-	<check_box
-		name="ao_randomize"
-		label="Randomize order"
-		tool_tip="Randomize order of animations in cycle mode."
-		left_pad="4"
-		width="100"
-		height="16"
-		follows="left|bottom"
-		layout="topleft" />
+		<text
+			name="ao_cycle_time_seconds_label"
+			value="Cycle time (seconds):"
+			left="0"
+			top_pad="4"
+			width="120"
+			follows="left|right|bottom"
+			layout="topleft" />
 
-	<text
-		name="ao_cycle_time_seconds_label"
-		value="Cycle time (seconds):"
-		left="0"
-		top_pad="4"
-		width="120"
-		follows="left|right|bottom"
-		layout="topleft" />
+		<spinner
+			name="ao_cycle_time"
+			tool_tip="Time before switching to the next animation in the list. Set this to 0 to disable automatic animation cycling."
+			top_delta="-6"
+			left_pad="8"
+			height="16"
+			right="-1"
+			decimal_digits="0"
+			initial_value="0"
+			min_val="0"
+			max_val="999"
+			increment="1"
+			follows="right|bottom"
+			layout="topleft" />
 
-	<spinner
-		name="ao_cycle_time"
-		tool_tip="Time before switching to the next animation in the list. Set this to 0 to disable automatic animation cycling."
-		top_delta="-6"
-		left_pad="8"
-		height="16"
-		right="-1"
-		decimal_digits="0"
-		initial_value="0"
-		min_val="0"
-		max_val="999"
-		increment="1"
-		follows="right|bottom"
-		layout="topleft" />
+		<button
+			name="ao_reload"
+			label="Reload"
+			tool_tip="Reload animation overrider configuration."
+			left="0"
+			top_pad="8"
+			right="-1"
+			height="20"
+			follows="left|right|bottom"
+			layout="topleft" />
 
-	<button
-		name="ao_reload"
-		label="Reload"
-		tool_tip="Reload animation overrider configuration."
-		left="0"
-		top_pad="8"
-		right="-1"
-		height="20"
-		follows="left|right|bottom"
-		layout="topleft" />
+		<layout_stack
+			name="next_previous_buttons_stack"
+			left="0"
+			top_pad="4"
+			right="-24"
+			height="20"
+			orientation="horizontal"
+			follows="left|right|bottom"
+			layout="topleft">
+
+		<layout_panel
+			width="90"
+			height="20"
+			user_resize="false"
+			follows="all"
+			layout="topleft">
+
+		<button
+			name="ao_previous"
+			image_overlay="BackArrow_Off"
+			tool_tip="Switch to previous animation of the current state."
+			left="0"
+			top="0"
+			width="88"
+			height="20"
+			follows="all"
+			layout="topleft" />
+
+		</layout_panel>
+		<layout_panel
+			width="90"
+			height="20"
+			user_resize="false"
+			follows="all"
+			layout="topleft">
+
+		<button
+			name="ao_next"
+			image_overlay="ForwardArrow_Off"
+			tool_tip="Switch to next animation of the current state."
+			left="2"
+			top="0"
+			width="88"
+			height="20"
+			follows="all"
+			layout="topleft" />
+
+		</layout_panel>
+		</layout_stack>
+
+		<button
+			name="ao_less"
+			tool_tip="Show small Animation Overrider interface."
+			image_overlay="DisclosureArrow_Opened_Off"
+			left_pad="4"
+			width="20"
+			height="20"
+			follows="right|bottom"
+			layout="topleft" />
 
 	</panel>
 
-	<layout_stack
-		name="next_previous_buttons_stack"
-		left="0"
-		top_pad="4"
-		right="-1"
-		height="20"
-		orientation="horizontal"
-		follows="left|right|bottom"
-		layout="topleft">
-
-	<layout_panel
-		width="90"
-		height="20"
-		user_resize="false"
-		follows="all"
-		layout="topleft">
-
-	<button
-		name="ao_previous"
-		label="&lt;&lt;"
-		tool_tip="Switch to previous animation of the current state."
-		left="0"
-		top="0"
-		width="88"
-		height="20"
-		follows="all"
-		layout="topleft" />
-
-	</layout_panel>
-	<layout_panel
-		width="90"
-		height="20"
-		user_resize="false"
-		follows="all"
-		layout="topleft">
-
-	<button
-		name="ao_next"
-		label="&gt;&gt;"
-		tool_tip="Switch to next animation of the current state."
-		left="2"
-		top="0"
-		width="88"
-		height="20"
-		follows="all"
-		layout="topleft" />
-
-	</layout_panel>
-	</layout_stack>
-
-	</panel>
+<!-- Reload Cover Panel -->
 
 	<panel
 		name="ao_reload_cover"
@@ -295,85 +300,151 @@
 		width="200"
 		height="315"
 		follows="all"
-		visible="true"
+		visible="false"
 		bg_alpha_color="Black_50"
 		bg_opaque_color="Black_50"
 		background_visible="true"
 		background_opaque="true"
 		mouse_opaque="true"
 		layout="topleft">
-	<panel
-		name="ao_reload_text_panel"
-		left="30"
-		top="110"
-		right="-30"
-		bottom="-110"
-		bg_alpha_color="Black_50"
-		bg_opaque_color="Black_50"
-		background_visible="true"
-		background_opaque="true"
-		follows="left|right|top">
-	<view_border
-		name="ao_reload_view_border"
-		left="0"
-		top="0"
-		right="-1"
-		bottom="-1"
-		follows="all" />
-	<text
-		left_delta="0"
-		top_delta="16"
-		halign="center"
-		valign="center"
-		follows="all">
-		Reloading Config
-	</text>
-	<text
-		v_pad="-4"
-		bottom="-16"
-		halign="center"
-		valign="center"
-		follows="all">
-		Please Wait
-	</text>
 
-	<layout_stack
-		name="ao_reload_indicator_layout_stack"
-		left="0"
-		top="31"
-		right="-1"
-		height="32"
-		orientation="horizontal"
-		follows="top|left|right">
-	<layout_panel
-		name="ao_reload_indicator_left_layout_panel"
-		width="160"
-		height="32"
-		user_resize="false">
-	</layout_panel>
-	<layout_panel
-		name="ao_reload_indicator_layout_panel"
-		width="32"
-		height="32"
-		auto_resize="false"
-		user_resize="false">
-	<loading_indicator
-		left="0"
-		top="0"
-		width="32"
-		height="32"
-		follows="right|top"
-		name="ao_reload_indicator" />
-	</layout_panel>
-	<layout_panel
-		name="ao_reload_indicator_right_layout_panel"
-		width="160"
-		height="32"
-		user_resize="false">
-	</layout_panel>
-	</layout_stack>
+		<panel
+			name="ao_reload_text_panel"
+			left="30"
+			top="110"
+			right="-30"
+			bottom="-110"
+			bg_alpha_color="Black_50"
+			bg_opaque_color="Black_50"
+			background_visible="true"
+			background_opaque="true"
+			follows="left|right|top">
 
+			<view_border
+				name="ao_reload_view_border"
+				left="0"
+				top="0"
+				right="-1"
+				bottom="-1"
+				follows="all" />
+			<text
+				left_delta="0"
+				top_delta="16"
+				halign="center"
+				valign="center"
+				follows="all">
+				Reloading Config
+			</text>
+			<text
+				v_pad="-4"
+				bottom="-16"
+				halign="center"
+				valign="center"
+				follows="all">
+				Please Wait
+			</text>
+
+			<layout_stack
+				name="ao_reload_indicator_layout_stack"
+				left="0"
+				top="31"
+				right="-1"
+				height="32"
+				orientation="horizontal"
+				follows="top|left|right">
+			<layout_panel
+				name="ao_reload_indicator_left_layout_panel"
+				width="160"
+				height="32"
+				user_resize="false">
+			</layout_panel>
+			<layout_panel
+				name="ao_reload_indicator_layout_panel"
+				width="32"
+				height="32"
+				auto_resize="false"
+				user_resize="false">
+			<loading_indicator
+				left="0"
+				top="0"
+				width="32"
+				height="32"
+				follows="right|top"
+				name="ao_reload_indicator" />
+			</layout_panel>
+			<layout_panel
+				name="ao_reload_indicator_right_layout_panel"
+				width="160"
+				height="32"
+				user_resize="false">
+			</layout_panel>
+			</layout_stack>
+
+		</panel>
 	</panel>
 
+<!-- Small Panel -->
+
+	<panel
+		name="animation_overrider_panel_small"
+		left="10"
+		top="4"
+		width="180"
+		height="45"
+		visible="false"
+		follows="left|right|top"
+		layout="topleft">
+
+	<combo_box
+		name="ao_set_selection_combo_small"
+		tool_tip="Select animation set to edit."
+		left="0"
+		top="0"
+		right="-24"
+		height="20"
+		follows="left|right|top"
+		layout="topleft" />
+
+	<button
+		name="ao_more"
+		tool_tip="Show full interface for configuration."
+		image_overlay="Edit_Wrench"
+		left_pad="4"
+		right="-1"
+		height="20"
+		follows="right|top"
+		layout="topleft" />
+
+	<button
+		name="ao_previous_small"
+		image_overlay="BackArrow_Off"
+		tool_tip="Switch to previous animation of the current state."
+		left="0"
+		top_pad="4"
+		width="62"
+		height="20"
+		follows="left|top"
+		layout="topleft" />
+
+	<button
+		name="ao_next_small"
+		image_overlay="ForwardArrow_Off"
+		tool_tip="Switch to next animation of the current state."
+		left_pad="4"
+		width="62"
+		height="20"
+		follows="left|top"
+		layout="topleft" />
+
+	<check_box
+		name="ao_sit_override_small"
+		label="Sits"
+		tool_tip="Check this if you want sit animation overrides."
+		left_pad="4"
+		width="45"
+		height="16"
+		follows="right|top"
+		layout="topleft" />
+
 	</panel>
 </panel>