Restructured edit layout to be more useful for content editing