wc-01 General Layout update