GGP-48: enlarge draw area and add a border