streamlining some layout issues