Merge again.
Fix storyboard.
Working merged version with bugs.
Merge with missing ui elements.