and some more layout tweaks. fine for now