Minor performance tweaks
CHange layout of sync panel