End of first part
Bugfixes and buttons to editmode container