BS-2412 From Forms to Portal, furhter improvments