even more layout improvements