minor tweaks with bool and storyboard
merge with storyboard elements