Fixes on notes UI and behaviour