Reorganised storyboard
Embedded views layout