add more samples, fix some element layout