User Interface Merge

Adding note-taking, subsequently rearranging gestures and navigation.