#79 modifyWay layout