Some minor changes
Merge branch 'design'