main view was improved
Merge remote-tracking branch 'MrTruster/master'