Code improvement + Improve button expansion effect.