more layout tweeks