sort out chart rendering, handle closing test modal better