diff --git a/tools/charactercreation/charactertool.xml b/tools/charactercreation/charactertool.xml
index 61aa389..338816e 100644
--- a/tools/charactercreation/charactertool.xml
+++ b/tools/charactercreation/charactertool.xml
@@ -4255,155 +4255,10 @@
                     </Content>
                 </GridContainer>
 
-                <Header>
-                    <Level>2</Level>
-                    <Text>"Magiekategorien"</Text>
-                </Header>
-                <ListDisplay>
-                    <List>[data.character.magic.categories]</List>
-                    <AllowRemove>true</AllowRemove>
-                    <Budget>[data.character.control.xp]</Budget>
-                    <Cost>charlib_magiccatprice_sum([level])</Cost>
-                    <Columns>
-                        <NameValueDisplay>
-                            <Name>"Name"</Name>
-                            <Value>[name]</Value>
-                        </NameValueDisplay>
-                        <NameValueDisplay>
-                            <Name>"Beschreibung"</Name>
-                            <Value>[description]</Value>
-                        </NameValueDisplay>
-                        <NameValueDisplay>
-                            <Name>"Wert"</Name>
-                            <Value>[level]</Value>
-                        </NameValueDisplay>
-                    </Columns>
-                    <Buttons>
-                        <Button>
-                            <Text>"+1"</Text>
-                            <OnClick>
-                                <Action>
-                                    <If>[level] &lt; 4</If>
-                                    <Do>[data.character.control.xp] - charlib_magiccatprice([level] + 1)</Do>
-                                    <Output>[data.character.control.xp]</Output>
-                                </Action>
-                                <Action>
-                                    <If>[level] &lt; 4</If>
-                                    <Do>[level] + 1</Do>
-                                    <Output>[level]</Output>
-                                </Action>
-                            </OnClick>
-                        </Button>
-                        <Button>
-                            <Text>"-1"</Text>
-                            <OnClick>
-                                <Action>
-                                    <If>[level] > 0</If>
-                                    <Do>[data.character.control.xp] + charlib_magiccatprice([level])</Do>
-                                    <Output>[data.character.control.xp]</Output>
-                                </Action>
-                                <Action>
-                                    <If>[level] > 0</If>
-                                    <Do>[level] - 1</Do>
-                                    <Output>[level]</Output>
-                                </Action>
-                            </OnClick>
-                        </Button>
-                    </Buttons>
-                </ListDisplay>
-
-                <BaseToListPicker>
-                    <List>[data.character.magic.categories]</List>
-                    <PropertyOutputs>
-                        <PropertyOutput>
-                            <Property>[file.name]</Property>
-                            <Output>[name]</Output>
-                        </PropertyOutput>
-                        <PropertyOutput>
-                            <Property>[magiccat.description]</Property>
-                            <Output>[description]</Output>
-                        </PropertyOutput>
-                        <PropertyOutput>
-                            <Property>0</Property>
-                            <Output>[level]</Output>
-                        </PropertyOutput>
-                    </PropertyOutputs>
-                    <Columns>
-                        <NameValueDisplay>
-                            <Name>"Name"</Name>
-                            <Value>[file.name]</Value>
-                        </NameValueDisplay>
-                        <NameValueDisplay>
-                            <Name>"Beschreibung"</Name>
-                            <Value>[magiccat.description]</Value>
-                        </NameValueDisplay>
-                    </Columns>
-                    <Base>[base.magiccats.Categories]</Base>
-                    <Budget>[data.character.control.xp]</Budget>
-                    <Cost>20</Cost>
-                </BaseToListPicker>
-
-                <Header>
-                    <Level>3</Level>
-                    <Text>"Neue Kategorie erstellen"</Text>
-                </Header>
-                <GridContainer>
-                    <Cols>2</Cols>
-                    <Content>
-                        <Label>
-                            <Text>"Name:"</Text>
-                        </Label>
-                        <StringInput>
-                            <Output>[data.character.magic.new_name]</Output>
-                        </StringInput>
-                        <Label>
-                            <Text>"Description:"</Text>
-                        </Label>
-                        <TextInput>
-                            <Output>[data.character.magic.new_description]</Output>
-                        </TextInput>
-                        <Empty/>
-                        <Button>
-                            <Text>"Hinzufügen"</Text>
-                            <OnClick>
-                                <AddListEntry>
-                                    <List>[data.character.magic.categories]</List>
-                                    <PropertyOutputs>
-                                        <PropertyOutput>
-                                            <Property>[data.character.magic.new_name]</Property>
-                                            <Output>[name]</Output>
-                                        </PropertyOutput>
-                                        <PropertyOutput>
-                                            <Property>[data.character.magic.new_description]</Property>
-                                            <Output>[description]</Output>
-                                        </PropertyOutput>
-                                        <PropertyOutput>
-                                            <Property>0</Property>
-                                            <Output>[level]</Output>
-                                        </PropertyOutput>
-                                    </PropertyOutputs>
-                                </AddListEntry>
-                                <Action>
-                                    <Do>[data.character.control.xp] - 20</Do>
-                                    <Output>[data.character.control.xp]</Output>
-                                </Action>
-                                <Action>
-                                    <Do>""</Do>
-                                    <Output>[data.character.magic.new_name]</Output>
-                                </Action>
-                                <Action>
-                                    <Do>""</Do>
-                                    <Output>[data.character.magic.new_description]</Output>
-                                </Action>
-                            </OnClick>
-                        </Button>
-                    </Content>
-                </GridContainer>
-
                 <!-- Items -->
                 <Header>
                     <Level>2</Level>
-                    <Text>"Magische Gegenstände"</Text>
+                    <Text>"Magische Gegenstände / Objekte"</Text>
                 </Header>
                 <Header>
                     <Level>3</Level>
@@ -4496,6 +4351,154 @@
                     <Cost>[item.cost]</Cost>
                 </BaseToListPicker>
 
+                <!-- Categories -->
+                <Header>
+                    <Level>2</Level>
+                    <Text>"Magiekategorien"</Text>
+                </Header>
+                <ListDisplay>
+                    <List>[data.character.magic.categories]</List>
+                    <AllowRemove>true</AllowRemove>
+                    <Budget>[data.character.control.xp]</Budget>
+                    <Cost>charlib_magiccatprice_sum([level])</Cost>
+                    <Columns>
+                        <NameValueDisplay>
+                            <Name>"Name"</Name>
+                            <Value>[name]</Value>
+                        </NameValueDisplay>
+                        <NameValueDisplay>
+                            <Name>"Beschreibung"</Name>
+                            <Value>[description]</Value>
+                        </NameValueDisplay>
+                        <NameValueDisplay>
+                            <Name>"Wert"</Name>
+                            <Value>[level]</Value>
+                        </NameValueDisplay>
+                    </Columns>
+                    <Buttons>
+                        <Button>
+                            <Text>"+1"</Text>
+                            <OnClick>
+                                <Action>
+                                    <If>[level] &lt; 4</If>
+                                    <Do>[data.character.control.xp] - charlib_magiccatprice([level] + 1)</Do>
+                                    <Output>[data.character.control.xp]</Output>
+                                </Action>
+                                <Action>
+                                    <If>[level] &lt; 4</If>
+                                    <Do>[level] + 1</Do>
+                                    <Output>[level]</Output>
+                                </Action>
+                            </OnClick>
+                        </Button>
+                        <Button>
+                            <Text>"-1"</Text>
+                            <OnClick>
+                                <Action>
+                                    <If>[level] > 0</If>
+                                    <Do>[data.character.control.xp] + charlib_magiccatprice([level])</Do>
+                                    <Output>[data.character.control.xp]</Output>
+                                </Action>
+                                <Action>
+                                    <If>[level] > 0</If>
+                                    <Do>[level] - 1</Do>
+                                    <Output>[level]</Output>
+                                </Action>
+                            </OnClick>
+                        </Button>
+                    </Buttons>
+                </ListDisplay>
+
+                <Header>
+                    <Level>3</Level>
+                    <Text>"Neue Kategorie erstellen"</Text>
+                </Header>
+                <GridContainer>
+                    <Cols>2</Cols>
+                    <Content>
+                        <Label>
+                            <Text>"Name:"</Text>
+                        </Label>
+                        <StringInput>
+                            <Output>[data.character.magic.new_name]</Output>
+                        </StringInput>
+                        <Label>
+                            <Text>"Description:"</Text>
+                        </Label>
+                        <TextInput>
+                            <Output>[data.character.magic.new_description]</Output>
+                        </TextInput>
+                        <Empty/>
+                        <Button>
+                            <Text>"Hinzufügen"</Text>
+                            <OnClick>
+                                <AddListEntry>
+                                    <List>[data.character.magic.categories]</List>
+                                    <PropertyOutputs>
+                                        <PropertyOutput>
+                                            <Property>[data.character.magic.new_name]</Property>
+                                            <Output>[name]</Output>
+                                        </PropertyOutput>
+                                        <PropertyOutput>
+                                            <Property>[data.character.magic.new_description]</Property>
+                                            <Output>[description]</Output>
+                                        </PropertyOutput>
+                                        <PropertyOutput>
+                                            <Property>0</Property>
+                                            <Output>[level]</Output>
+                                        </PropertyOutput>
+                                    </PropertyOutputs>
+                                </AddListEntry>
+                                <Action>
+                                    <Do>[data.character.control.xp] - 20</Do>
+                                    <Output>[data.character.control.xp]</Output>
+                                </Action>
+                                <Action>
+                                    <Do>""</Do>
+                                    <Output>[data.character.magic.new_name]</Output>
+                                </Action>
+                                <Action>
+                                    <Do>""</Do>
+                                    <Output>[data.character.magic.new_description]</Output>
+                                </Action>
+                            </OnClick>
+                        </Button>
+                    </Content>
+                </GridContainer>
+
+                <BaseToListPicker>
+                    <List>[data.character.magic.categories]</List>
+                    <PropertyOutputs>
+                        <PropertyOutput>
+                            <Property>[file.name]</Property>
+                            <Output>[name]</Output>
+                        </PropertyOutput>
+                        <PropertyOutput>
+                            <Property>[magiccat.description]</Property>
+                            <Output>[description]</Output>
+                        </PropertyOutput>
+                        <PropertyOutput>
+                            <Property>0</Property>
+                            <Output>[level]</Output>
+                        </PropertyOutput>
+                    </PropertyOutputs>
+                    <Columns>
+                        <NameValueDisplay>
+                            <Name>"Name"</Name>
+                            <Value>[file.name]</Value>
+                        </NameValueDisplay>
+                        <NameValueDisplay>
+                            <Name>"Beschreibung"</Name>
+                            <Value>[magiccat.description]</Value>
+                        </NameValueDisplay>
+                    </Columns>
+                    <Base>[base.magiccats.Categories]</Base>
+                    <Budget>[data.character.control.xp]</Budget>
+                    <Cost>20</Cost>
+                </BaseToListPicker>
+
+
+
 
 
             </Content>