Panel Buttons display fixes