Merge the latest approved design

The latest approved design with multi-language support, bbapp and b3 support.