Changed some Buttons and funcionality