Add filled box and fix filled polygon