Add more layout code