Uni A-Z layout tweaked