fixed bug, added some buttons