Fixing small errors in ButtonPanel