(1) Uploaded new images; (2) Removed curve on subpage top header
fix merge conflict
fix conflicts on scripts.php