Added complete layout