20130418.02 - Rearranging the notes-view. Plus some minor notification improvements