Refactor in porep for desktop site