Fixed some bugs and change the storyboard for layouts.