Remove branding and fix persistence of the text box
Minor fixes
Merge branch 'release/0.2.5' into develop

* release/0.2.5:
  Minor fixes