Bugfix - update name and position from Setup
Cleanup and fix setup