Repair the rocket bar and the context menu
Merge branch 'content' of github.com:vingtetun/gaia into HEAD