Moved buttons for packaging and deployment