New buttons

I added new buttons and improved the code