fixed layout a bit more