Notes and UI tweak