Fix #BB-870
Add ember rc6 adn some style