Separate forms for ForeX and WLM, new routes