Mostly changes to layout

for the display in the office