--Fixes for Evaluation button and sample data