Account editor now working inside container