Some refactoring + ability to view past notes