Fixes Storyboard issues, minor tweaks to existing code, fully implements Flavor functionality