adjusting header picture panel
adjusting conficts in 2 files
changing editor options