Changed and added buttons