Fixed merge conflict
[#67390936]Fixed bad scrollview autolayout height
Moved storyboard to views folder
Moved storyboard to views folder
Restored accidentally removed image
[#67390936] Tweaked colors and locked rotation