Fixes for Ginger bread + improve layout
Merge pull request #2 from thomasdao/master

Fixes for Ginger bread + improve layout