more layout & style tweaks