Updated module so it's easier to set a layout