Indent Fixes & Added modules to main js