Done splitting intitial storyboard
Fix bug with non-existing button and bug with wrong selection
Cleanup
Merge branch 'fb-splitstoryboard' into dev