[UPDATE] Integrate new storyboard and embedded framework