Added new countAll and new Layout