Better layout and SnapSync integration