Empty view, Edit notes and other fixes