A lot of edits to the storyboard. UI is being finalised.