View update and execute refactoring

Last PR was merged too fast, so some bug was merged.
Big corrected.
Execute refactored.