Simplify and complete basic layout