Various fixes and layout changes for companies