New evatest layout