Fixes for Ginger bread + improve layout