Added rectangle class + set tabs right in the circle and rectangle files