Added some buttons and revive funtcionality