Added fill mode to rect. Changed layout format.