Added some buttoms and changed properties