Workaround for polymer related layout issue (fixed #666)
Merge pull request #710 from dinhviethoa/666-fix-ui-layout

Workaround for polymer related layout issue (fixed #666)