fixed layout and added modules to support functionality