refactored rectangle and rounded rectangle