Fixed Bugs, Basic Skeleton
Storyboard Changes