minor layout changes
Merge the weekend work with Friday's styling features