[CLEANUP] Visualization Screen fix, adding legacy comments