Regression: Fix the editor guider message for first time users

When editing for the first time users get a special message which was
not showing.
Add editor related FIXME's to make sure we do some work
to ensure this doesn't happen again
and clean it up

Change-Id: I4dfc272819ebc6dbb52deed5a14afb8cab941a39