trying to fix merge conflict with loading.js
recommitting css changes due to loss of changes in stash; just updating look of note buttons