Gave "Add" its own menu

And organized the main form a bit