BugFix (update synch, layout)