Starting to optimise

And I also added the Toplevel Add window