change positions and add buttons