Added some button callbacks