Second Commit

Improved Edit and Create windows.
Improved Class-Structure