Added more layout components