Add 50 items' limit + Correct some graphic elements