Fixed "Edit Bug", work on GUI and more bugfixes