Added more layout