- remove tabs
Merge branch 'redesign'