Add margin and change button