Minor story board changes
Merge remote-tracking branch 'Master/master'