Fix rubbishbin, add note panel