Refactor PDP into new layout