Fixed async exec issue with update feature, fixed strange layout for now