restructuring of exec page
merge fix