The editor draws the boundaries. (+ Some Fixes)