improve components geometry vars