remake domain mapping
Merge branch 'sidebar' into staging2