Update with new seperate panel Button Panel