Added line and rectangle drawing