layout fix and sync stuff