Layout update + remove unused partial