WiP rework accounts management screen