clean up on the note side
Merge branch 'round' into testing
Merge branch 'testing' of https://github.com/sharewave/frontus into testing