Gingerbread layout tweaks