remove dependence to layout module