Updated script layout