Fix layout, Fix bug crash
Update layout, add icon new