Reset ui content
Fix issue related to ribbons glitch on firefox
Merge branch 'master' into dev