changed button border
merged and added animation