Various updates. Added modal JS module