add more layouts and test