improvement layouts and editor