Minor fixes Code cleanup Made the theme a bit more structured
The note is not visible to the blocked user.