Fixed some layout issues
Merge branch 'master' of https://github.com/MichaelKohler/jabber-firefox-os