more layout tweaks and some fixes for empty combined lists