cleaned up some buttons