Add buttons and cleanup