added layout removed watch from scripts