Moved remarks editor to seperate file