Reviewed old files modified in new_panels branch