Add info box
Merge branch 'master' into add-info-box
Remove console logging