Simplify layout markup but keep layout the same