better layout, add subs and text