Added button; fixed Panel bug