further fixes to layout