added and improved some module on layout creation