Added defer and buttons is done