First of all doing anything I post here could and will adversly affect any other class that has a pet bar. With that being said let the mod's begin =P.

Go to line 95 and change that line to the one you are using in your macro.
That should perm put your action bar where you want it. Now it seems you want to get rid of the shape shift bar. So lets tackle that.