Improve formatting of base shapes