add icon,
fix layout bugs