cosmethic changes in default and error view
Merge remote-tracking branch 'origin/master'