Changed theme module & Fixed javascript bug