Added Class Layout handling