Moved Content area and imagefield correctly this time