simplify layout a bit more