Improved appearance of notes, did #1 and #2 (kinda unsatisfactorily)