Added layout gunk