Updated Storyboard and UI, still incomplete