Simplify layout a little