WIPA- Restructure print setup