Improvements for branding page

* Merges into the 'middleman' branch

Fixes #3