Some clear animation and buttons added