more mixes, layout tweak