Fixed add cat, and authomatic selection
damned schema, stop changing
fix modal position
fix merge