WP-2999 Moving the eva forms under their appropriate tabs