Merge pull request #16 from Olyol95/Subgroup3

Subgroup3
cleaned up notes screen, got rid of unnecessary stuff
Merge pull request #17 from Olyol95/Subgroup1

cleaned up notes screen, got rid of unnecessary stuff
Merge pull request #20 from Olyol95/master

Subgroup3